SF.net SVN: gar:[26799] csw/mgar/pkg/subversion/trunk

Sat Sep 18 10:39:09 CEST 2021

Revision: 26799
          http://sourceforge.net/p/gar/code/26799
Author:   dmichelsen
Date:     2021-09-18 08:39:09 +0000 (Sat, 18 Sep 2021)
Log Message:
-----------
subversion/trunk: Backport to Python 2.7

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================

--- csw/mgar/pkg/subversion/trunk/Makefile	2021-09-17 09:34:45 UTC (rev 26798)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2021-09-18 08:39:09 UTC (rev 26799)
@@ -49,7 +49,7 @@
 PATCHFILES += 0001-During-inclusion-of-stdio.h-there-is-sys-feature_tes.patch
 
 # Subversion 1.14.1 now requires at least Python 3.3, backport to 2.7 for now
-PATCHFILES += 0001-Backport-to-Python-2.7.patch
+# This is now done in post-patch-modulated
 
 VENDOR_URL = http://subversion.apache.org
 LICENSE = LICENSE
@@ -625,6 +625,19 @@
 
 include gar/category.mk
 
+# Backport to Python 2.7 by removing annotations
+post-patch-modulated:
+	cd $(WORKSRC) && \
+	  perl -i.py33 -npe "if( /^\s*def / ) { s/:\s+'[^']*'//g; s/\s*->\s*\"[^\"]*\"// }" \
+		subversion/bindings/swig/python/client.py \
+		subversion/bindings/swig/python/core.py \
+		subversion/bindings/swig/python/delta.py \
+		subversion/bindings/swig/python/diff.py \
+		subversion/bindings/swig/python/fs.py \
+		subversion/bindings/swig/python/ra.py \
+		subversion/bindings/swig/python/repos.py \
+		subversion/bindings/swig/python/wc.py
+
 # pygthon bindings do not link since svn-1.6.5 ...
 BINDING_LANGS-5.9-32 = perl python ruby
 BINDING_LANGS-5.9-64 = perl python ruby

Deleted: csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch	2021-09-17 09:34:45 UTC (rev 26798)
+++ csw/mgar/pkg/subversion/trunk/files/0001-Backport-to-Python-2.7.patch	2021-09-18 08:39:09 UTC (rev 26799)
@@ -1,1333 +0,0 @@
-From e94c715780e95cd52f22cf6a5006940eb9b1ca2a Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 15 Sep 2021 15:56:01 +0200
-Subject: [PATCH] Backport to Python 2.7
-
----
- subversion/bindings/swig/python/client.py | 510 +++++++++++++++---------------
- 1 file changed, 255 insertions(+), 255 deletions(-)
-
-diff --git a/subversion/bindings/swig/python/client.py b/subversion/bindings/swig/python/client.py
-index f094027..f5c53ae 100644
---- a/subversion/bindings/swig/python/client.py
-+++ b/subversion/bindings/swig/python/client.py
-@@ -143,51 +143,51 @@ import libsvn.delta
- import libsvn.wc
- import libsvn.ra
- 
--def svn_client_version() -> "svn_version_t const *":
-+def svn_client_version():
-     """svn_client_version() -> svn_version_t const *"""
-     return _client.svn_client_version()
- 
--def svn_client_get_simple_prompt_provider(*args) -> "svn_auth_provider_object_t **":
-+def svn_client_get_simple_prompt_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_username_prompt_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_simple_provider(*args):
-     """svn_client_get_simple_provider(apr_pool_t pool)"""
-     return _client.svn_client_get_simple_provider(*args)
- 
--def svn_client_get_username_provider(*args) -> "svn_auth_provider_object_t **":
-+def svn_client_get_username_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_ssl_server_trust_file_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_ssl_client_cert_file_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_ssl_client_cert_pw_file_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_ssl_server_trust_prompt_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_ssl_client_cert_prompt_provider(*args):
-     """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) -> "svn_auth_provider_object_t **":
-+def svn_client_get_ssl_client_cert_pw_prompt_provider(*args):
-     """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) -> "svn_client_proplist_item_t *":
-+def svn_client_proplist_item_dup(*args):
-     """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(object):
-@@ -603,19 +603,19 @@ 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) -> "svn_client_commit_item3_t *":
-+def svn_client_commit_item3_create(*args):
-     """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) -> "svn_client_commit_item3_t const **":
-+def svn_client_commit_item_create(*args):
-     """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) -> "svn_client_commit_item3_t *":
-+def svn_client_commit_item3_dup(*args):
-     """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) -> "svn_client_commit_item2_t *":
-+def svn_client_commit_item2_dup(*args):
-     """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
-@@ -721,7 +721,7 @@ 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) -> "svn_client_diff_summarize_t *":
-+def svn_client_diff_summarize_dup(*args):
-     """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(object):
-@@ -845,161 +845,161 @@ 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) -> "svn_client_ctx_t **":
-+def svn_client_create_context2(*args):
-     """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) -> "svn_client_ctx_t **":
-+def svn_client_create_context(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_args_to_target_array2(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_args_to_target_array(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_checkout3(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_checkout2(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_checkout(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_update4(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_update3(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_update2(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_update(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_switch3(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_switch2(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_switch(*args):
-     """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) -> "svn_error_t *":
-+def svn_client__layout_list(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_add5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_add4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_add3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_add2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_add(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_mkdir4(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_mkdir3(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_mkdir2(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_mkdir(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_delete4(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_delete3(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_delete2(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_delete(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_import5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_import4(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_import3(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_import2(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_import(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_commit6(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_commit5(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_commit4(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_commit3(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_commit2(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_commit(*args):
-     """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(object):
-@@ -1130,259 +1130,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) -> "svn_client_status_t *":
-+def svn_client_status_dup(*args):
-     """svn_client_status_dup(svn_client_status_t status, apr_pool_t result_pool) -> svn_client_status_t"""
-     return _client.svn_client_status_dup(*args)
- 
--def svn_client_status6(*args) -> "svn_revnum_t *":
-+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, apr_pool_t scratch_pool) -> svn_error_t"""
-     return _client.svn_client_status6(*args)
- 
--def svn_client_status5(*args) -> "svn_revnum_t *":
-+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, apr_pool_t scratch_pool) -> svn_error_t"""
-     return _client.svn_client_status5(*args)
- 
--def svn_client_status4(*args) -> "svn_revnum_t *":
-+def svn_client_status4(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_status3(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_status2(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_status(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_log5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_log4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_log3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_log2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_log(*args):
-     """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) -> "svn_revnum_t *, svn_revnum_t *":
-+def svn_client_blame6(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_blame5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_blame4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_blame3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_blame2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_blame(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff7(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff6(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_peg7(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_peg6(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_peg5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_peg4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_peg3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_peg2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_peg(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_summarize2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_summarize(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_summarize_peg2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_diff_summarize_peg(*args):
-     """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) -> "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 **":
-+def svn_client_get_merging_summary(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge_reintegrate(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge_peg5(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge_peg4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge_peg3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge_peg2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_merge_peg(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_suggest_merge_sources(*args):
-     """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) -> "apr_hash_t **":
-+def svn_client_mergeinfo_get_merged(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_mergeinfo_log2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_mergeinfo_log(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_mergeinfo_log_merged(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_mergeinfo_log_eligible(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_vacuum(*args):
-     """svn_client_vacuum(char const * dir_abspath, svn_boolean_t remove_unversioned_items, svn_boolean_t remove_ignored_items, svn_boolean_t fix_recorded_timestamps, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
-     return _client.svn_client_vacuum(*args)
- 
--def svn_client_cleanup2(*args) -> "svn_error_t *":
-+def svn_client_cleanup2(*args):
-     """svn_client_cleanup2(char const * dir_abspath, svn_boolean_t break_locks, svn_boolean_t fix_recorded_timestamps, svn_boolean_t clear_dav_cache, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
-     return _client.svn_client_cleanup2(*args)
- 
--def svn_client_cleanup(*args) -> "svn_error_t *":
-+def svn_client_cleanup(*args):
-     """svn_client_cleanup(char const * dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
-     return _client.svn_client_cleanup(*args)
- 
--def svn_client_upgrade(*args) -> "svn_error_t *":
-+def svn_client_upgrade(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_relocate2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_relocate(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_revert4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_revert3(*args):
-     """svn_client_revert3(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, svn_boolean_t metadata_only, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
-     return _client.svn_client_revert3(*args)
- 
--def svn_client_revert2(*args) -> "svn_error_t *":
-+def svn_client_revert2(*args):
-     """svn_client_revert2(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
-     return _client.svn_client_revert2(*args)
- 
--def svn_client_revert(*args) -> "svn_error_t *":
-+def svn_client_revert(*args):
-     """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
-@@ -1416,187 +1416,187 @@ 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: 'svn_client_conflict_option_t *', merged_propval: 'svn_string_t const *') -> "void":
-+def svn_client_conflict_option_set_merged_propval(option, merged_propval):
-     """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) -> "apr_array_header_t **":
-+def svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_conflict_option_get_moved_to_repos_relpath_candidates(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_option_set_moved_to_repos_relpath2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_option_set_moved_to_repos_relpath(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_conflict_option_get_moved_to_abspath_candidates2(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_conflict_option_get_moved_to_abspath_candidates(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_option_set_moved_to_abspath2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_option_set_moved_to_abspath(*args):
-     """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: 'apr_array_header_t', option_id: 'svn_client_conflict_option_id_t') -> "svn_client_conflict_option_t *":
-+def svn_client_conflict_option_find_by_id(options, option_id):
-     """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) -> "svn_client_conflict_t **":
-+def svn_client_conflict_get(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_walk(*args):
-     """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) -> "svn_boolean_t *, apr_array_header_t **, svn_boolean_t *":
-+def svn_client_conflict_get_conflicted(*args):
-     """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) -> "char const **":
-+def svn_client_conflict_prop_get_description(*args):
-     """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) -> "char const **, char const **":
-+def svn_client_conflict_tree_get_description(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_conflict_text_get_resolution_options(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_conflict_prop_get_resolution_options(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_conflict_tree_get_resolution_options(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_tree_get_details(*args):
-     """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: 'svn_client_conflict_option_t *') -> "svn_client_conflict_option_id_t":
-+def svn_client_conflict_option_get_id(option):
-     """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) -> "char const *":
-+def svn_client_conflict_option_get_label(*args):
-     """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) -> "char const *":
-+def svn_client_conflict_option_get_description(*args):
-     """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: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t":
-+def svn_client_conflict_get_recommended_option_id(conflict):
-     """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: 'svn_client_conflict_t *') -> "char const *":
-+def svn_client_conflict_get_local_abspath(conflict):
-     """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: 'svn_client_conflict_t *') -> "svn_wc_operation_t":
-+def svn_client_conflict_get_operation(conflict):
-     """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: 'svn_client_conflict_t *') -> "svn_wc_conflict_action_t":
-+def svn_client_conflict_get_incoming_change(conflict):
-     """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: 'svn_client_conflict_t *') -> "svn_wc_conflict_reason_t":
-+def svn_client_conflict_get_local_change(conflict):
-     """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) -> "char const **, char const **":
-+def svn_client_conflict_get_repos_info(*args):
-     """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) -> "char const **, svn_revnum_t *, svn_node_kind_t *":
-+def svn_client_conflict_get_incoming_old_repos_location(*args):
-     """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) -> "char const **, svn_revnum_t *, svn_node_kind_t *":
-+def svn_client_conflict_get_incoming_new_repos_location(*args):
-     """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: 'svn_client_conflict_t *') -> "svn_node_kind_t":
-+def svn_client_conflict_tree_get_victim_node_kind(conflict):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_tree_resolve(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_tree_resolve_by_id(*args):
-     """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: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t":
-+def svn_client_conflict_tree_get_resolution(conflict):
-     """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: 'svn_client_conflict_t *') -> "char const *":
-+def svn_client_conflict_prop_get_reject_abspath(conflict):
-     """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) -> "svn_string_t **, svn_string_t **, svn_string_t **, svn_string_t **":
-+def svn_client_conflict_prop_get_propvals(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_prop_resolve(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_prop_resolve_by_id(*args):
-     """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: 'svn_client_conflict_t *', propname: 'char const *') -> "svn_client_conflict_option_id_t":
-+def svn_client_conflict_prop_get_resolution(conflict, propname):
-     """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: 'svn_client_conflict_t *') -> "char const *":
-+def svn_client_conflict_text_get_mime_type(conflict):
-     """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) -> "char const **, char const **, char const **, char const **":
-+def svn_client_conflict_text_get_contents(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_text_resolve(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_conflict_text_resolve_by_id(*args):
-     """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: 'svn_client_conflict_t *') -> "svn_client_conflict_option_id_t":
-+def svn_client_conflict_text_get_resolution(conflict):
-     """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) -> "svn_error_t *":
-+def svn_client_resolved(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_resolve(*args):
-     """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(object):
-@@ -1697,211 +1697,211 @@ svn_client_copy_source_t_swigregister = _client.svn_client_copy_source_t_swigreg
- svn_client_copy_source_t_swigregister(svn_client_copy_source_t)
- 
- 
--def svn_client_copy7(*args) -> "svn_error_t *":
-+def svn_client_copy7(*args):
-     """svn_client_copy7(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, svn_boolean_t ignore_externals, svn_boolean_t metadata_only, svn_boolean_t pin_externals, apr_hash_t externals_to_pin, apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
-     return _client.svn_client_copy7(*args)
- 
--def svn_client_copy6(*args) -> "svn_error_t *":
-+def svn_client_copy6(*args):
-     """svn_client_copy6(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, 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) -> "svn_commit_info_t **":
-+def svn_client_copy5(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_copy4(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_copy3(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_copy2(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_copy(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_move7(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_move6(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_move5(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_move4(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_move3(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_move2(*args):
-     """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) -> "svn_client_commit_info_t **":
-+def svn_client_move(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_propset_remote(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_propset_local(*args):
-     """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) -> "svn_commit_info_t **":
-+def svn_client_propset3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_propset2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_propset(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_revprop_set2(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_revprop_set(*args):
-     """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) -> "apr_hash_t **, apr_array_header_t **, svn_revnum_t *":
-+def svn_client_propget5(*args):
-     """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) -> "apr_hash_t **, svn_revnum_t *":
-+def svn_client_propget4(*args):
-     """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) -> "apr_hash_t **, svn_revnum_t *":
-+def svn_client_propget3(*args):
-     """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) -> "apr_hash_t **":
-+def svn_client_propget2(*args):
-     """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) -> "apr_hash_t **":
-+def svn_client_propget(*args):
-     """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) -> "svn_string_t **, svn_revnum_t *":
-+def svn_client_revprop_get(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_proplist4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_proplist3(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_proplist2(*args):
-     """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) -> "apr_array_header_t **":
-+def svn_client_proplist(*args):
-     """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) -> "apr_hash_t **, svn_revnum_t *":
-+def svn_client_revprop_list(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_export5(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_export4(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_export3(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_export2(*args):
-     """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) -> "svn_revnum_t *":
-+def svn_client_export(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_list4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_list3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_list2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_list(*args):
-     """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) -> "apr_hash_t **, apr_hash_t **":
-+def svn_client_ls3(*args):
-     """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) -> "apr_hash_t **":
-+def svn_client_ls2(*args):
-     """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) -> "apr_hash_t **":
-+def svn_client_ls(*args):
-     """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) -> "apr_hash_t **":
-+def svn_client_cat3(*args):
-     """svn_client_cat3(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_boolean_t expand_keywords, svn_client_ctx_t ctx, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
-     return _client.svn_client_cat3(*args)
- 
--def svn_client_cat2(*args) -> "svn_error_t *":
-+def svn_client_cat2(*args):
-     """svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t"""
-     return _client.svn_client_cat2(*args)
- 
--def svn_client_cat(*args) -> "svn_error_t *":
-+def svn_client_cat(*args):
-     """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)
- 
--def svn_client_add_to_changelist(*args) -> "svn_error_t *":
-+def svn_client_add_to_changelist(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_remove_from_changelists(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_get_changelists(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_lock(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_unlock(*args):
-     """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(object):
-@@ -2026,7 +2026,7 @@ svn_info_t_swigregister = _client.svn_info_t_swigregister
- svn_info_t_swigregister(svn_info_t)
- 
- 
--def svn_info_dup(*args) -> "svn_info_t *":
-+def svn_info_dup(*args):
-     """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(object):
-@@ -2135,71 +2135,71 @@ 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) -> "svn_client_info2_t *":
-+def svn_client_info2_dup(*args):
-     """svn_client_info2_dup(svn_client_info2_t info, apr_pool_t pool) -> svn_client_info2_t"""
-     return _client.svn_client_info2_dup(*args)
- 
--def svn_client_info4(*args) -> "svn_error_t *":
-+def svn_client_info4(*args):
-     """svn_client_info4(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, svn_boolean_t include_externals, apr_array_header_t changelists, svn_client_info_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
-     return _client.svn_client_info4(*args)
- 
--def svn_client_info3(*args) -> "svn_error_t *":
-+def svn_client_info3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_info2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_info(*args):
-     """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) -> "char const **":
-+def svn_client_get_wc_root(*args):
-     """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) -> "svn_revnum_t *, svn_revnum_t *":
-+def svn_client_min_max_revisions(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_patch(*args):
-     """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) -> "char const **":
-+def svn_client_url_from_path2(*args):
-     """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) -> "char const **":
-+def svn_client_url_from_path(*args):
-     """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) -> "char const **, char const **":
-+def svn_client_get_repos_root(*args):
-     """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) -> "char const **":
-+def svn_client_root_url_from_path(*args):
-     """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) -> "char const **":
-+def svn_client_uuid_from_url(*args):
-     """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) -> "char const **":
-+def svn_client_uuid_from_path2(*args):
-     """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) -> "char const **":
-+def svn_client_uuid_from_path(*args):
-     """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) -> "svn_ra_session_t **":
-+def svn_client_open_ra_session2(*args):
-     """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) -> "svn_ra_session_t **":
-+def svn_client_open_ra_session(*args):
-     """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(object):
-@@ -2377,79 +2377,79 @@ svn_client_conflict_option_t_swigregister = _client.svn_client_conflict_option_t
- svn_client_conflict_option_t_swigregister(svn_client_conflict_option_t)
- 
- 
--def svn_proplist_invoke_receiver2(*args) -> "svn_error_t *":
-+def svn_proplist_invoke_receiver2(*args):
-     """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) -> "svn_error_t *":
-+def svn_proplist_invoke_receiver(*args):
-     """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) -> "char const **, char const **":
-+def svn_client_invoke_get_commit_log3(*args):
-     """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) -> "char const **, char const **":
-+def svn_client_invoke_get_commit_log2(*args):
-     """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) -> "char const **, char const **":
-+def svn_client_invoke_get_commit_log(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_invoke_blame_receiver4(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_invoke_blame_receiver3(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_invoke_blame_receiver2(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_invoke_blame_receiver(*args):
-     """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) -> "svn_error_t *":
-+def svn_client_invoke_diff_summarize_func(*args):
-     """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)
- 

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

