Imported from /home/lorry/working-area/delta_subversion-tarball/subversion-1.8.13.tar.gz.subversion-1.8.13

1 files changed, 106 insertions, 138 deletions

diff --git a/subversion/bindings/swig/python/diff.py b/subversion/bindings/swig/python/diff.py
index 1c5c777..476236d 100644
--- a/subversion/bindings/swig/python/diff.py
+++ b/subversion/bindings/swig/python/diff.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.4
+# Version 2.0.9
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
@@ -84,10 +84,10 @@ def _assert_valid_deep(value):
     if hasattr(value, "assert_valid"):
       value.assert_valid()
 
-import core
+import libsvn.core
 
 def svn_diff_version():
-  """svn_diff_version() -> svn_version_t"""
+  """svn_diff_version() -> svn_version_t const *"""
   return _diff.svn_diff_version()
 svn_diff_datasource_original = _diff.svn_diff_datasource_original
 svn_diff_datasource_modified = _diff.svn_diff_datasource_modified
@@ -173,7 +173,7 @@ class svn_diff_fns2_t:
       return svn_diff_fns2_invoke_token_discard_all(self, *args)
 
     def __init__(self): 
-        """__init__(self) -> svn_diff_fns2_t"""
+        """__init__(svn_diff_fns2_t self) -> svn_diff_fns2_t"""
         this = _diff.new_svn_diff_fns2_t()
         try: self.this.append(this)
         except: self.this = this
@@ -262,7 +262,7 @@ class svn_diff_fns_t:
       return svn_diff_fns_invoke_token_discard_all(self, *args)
 
     def __init__(self): 
-        """__init__(self) -> svn_diff_fns_t"""
+        """__init__(svn_diff_fns_t self) -> svn_diff_fns_t"""
         this = _diff.new_svn_diff_fns_t()
         try: self.this.append(this)
         except: self.this = this
@@ -273,35 +273,35 @@ svn_diff_fns_t_swigregister(svn_diff_fns_t)
 
 
 def svn_diff_diff_2(*args):
-  """svn_diff_diff_2(void diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_diff_2(void * diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_diff_2(*args)
 
 def svn_diff_diff(*args):
-  """svn_diff_diff(void diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_diff(void * diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_diff(*args)
 
 def svn_diff_diff3_2(*args):
-  """svn_diff_diff3_2(void diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_diff3_2(void * diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_diff3_2(*args)
 
 def svn_diff_diff3(*args):
-  """svn_diff_diff3(void diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_diff3(void * diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_diff3(*args)
 
 def svn_diff_diff4_2(*args):
-  """svn_diff_diff4_2(void diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_diff4_2(void * diff_baton, svn_diff_fns2_t diff_fns, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_diff4_2(*args)
 
 def svn_diff_diff4(*args):
-  """svn_diff_diff4(void diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_diff4(void * diff_baton, svn_diff_fns_t diff_fns, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_diff4(*args)
 
 def svn_diff_contains_conflicts(*args):
-  """svn_diff_contains_conflicts(svn_diff_t diff) -> svn_boolean_t"""
+  """svn_diff_contains_conflicts(svn_diff_t * diff) -> svn_boolean_t"""
   return _diff.svn_diff_contains_conflicts(*args)
 
 def svn_diff_contains_diffs(*args):
-  """svn_diff_contains_diffs(svn_diff_t diff) -> svn_boolean_t"""
+  """svn_diff_contains_diffs(svn_diff_t * diff) -> svn_boolean_t"""
   return _diff.svn_diff_contains_diffs(*args)
 class svn_diff_output_fns_t:
     """Proxy of C svn_diff_output_fns_t struct"""
@@ -378,7 +378,7 @@ class svn_diff_output_fns_t:
       return svn_diff_output_fns_invoke_output_conflict(self, *args)
 
     def __init__(self): 
-        """__init__(self) -> svn_diff_output_fns_t"""
+        """__init__(svn_diff_output_fns_t self) -> svn_diff_output_fns_t"""
         this = _diff.new_svn_diff_output_fns_t()
         try: self.this.append(this)
         except: self.this = this
@@ -395,7 +395,7 @@ svn_diff_conflict_display_latest = _diff.svn_diff_conflict_display_latest
 svn_diff_conflict_display_only_conflicts = _diff.svn_diff_conflict_display_only_conflicts
 
 def svn_diff_output(*args):
-  """svn_diff_output(svn_diff_t diff, void output_baton, svn_diff_output_fns_t output_fns) -> svn_error_t"""
+  """svn_diff_output(svn_diff_t * diff, void * output_baton, svn_diff_output_fns_t output_fns) -> svn_error_t"""
   return _diff.svn_diff_output(*args)
 svn_diff_file_ignore_space_none = _diff.svn_diff_file_ignore_space_none
 svn_diff_file_ignore_space_change = _diff.svn_diff_file_ignore_space_change
@@ -456,7 +456,7 @@ class svn_diff_file_options_t:
       return _swig_setattr(self, self.__class__, name, value)
 
     def __init__(self): 
-        """__init__(self) -> svn_diff_file_options_t"""
+        """__init__(svn_diff_file_options_t self) -> svn_diff_file_options_t"""
         this = _diff.new_svn_diff_file_options_t()
         try: self.this.append(this)
         except: self.this = this
@@ -471,81 +471,72 @@ def svn_diff_file_options_create(*args):
   return _diff.svn_diff_file_options_create(*args)
 
 def svn_diff_file_options_parse(*args):
-  """
-    svn_diff_file_options_parse(svn_diff_file_options_t options, apr_array_header_t args, 
-        apr_pool_t pool) -> svn_error_t
-    """
+  """svn_diff_file_options_parse(svn_diff_file_options_t options, apr_array_header_t args, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_file_options_parse(*args)
 
 def svn_diff_file_diff_2(*args):
-  """
-    svn_diff_file_diff_2(char original, char modified, svn_diff_file_options_t options, 
-        apr_pool_t pool) -> svn_error_t
-    """
+  """svn_diff_file_diff_2(char const * original, char const * modified, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_file_diff_2(*args)
 
 def svn_diff_file_diff(*args):
-  """svn_diff_file_diff(char original, char modified, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_file_diff(char const * original, char const * modified, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_file_diff(*args)
 
 def svn_diff_file_diff3_2(*args):
   """
-    svn_diff_file_diff3_2(char original, char modified, char latest, svn_diff_file_options_t options, 
+    svn_diff_file_diff3_2(char const * original, char const * modified, char const * latest, svn_diff_file_options_t options, 
         apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_file_diff3_2(*args)
 
 def svn_diff_file_diff3(*args):
-  """svn_diff_file_diff3(char original, char modified, char latest, apr_pool_t pool) -> svn_error_t"""
+  """svn_diff_file_diff3(char const * original, char const * modified, char const * latest, apr_pool_t pool) -> svn_error_t"""
   return _diff.svn_diff_file_diff3(*args)
 
 def svn_diff_file_diff4_2(*args):
   """
-    svn_diff_file_diff4_2(char original, char modified, char latest, char ancestor, 
+    svn_diff_file_diff4_2(char const * original, char const * modified, char const * latest, char const * ancestor, 
         svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_file_diff4_2(*args)
 
 def svn_diff_file_diff4(*args):
   """
-    svn_diff_file_diff4(char original, char modified, char latest, char ancestor, 
+    svn_diff_file_diff4(char const * original, char const * modified, char const * latest, char const * ancestor, 
         apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_file_diff4(*args)
 
 def svn_diff_file_output_unified3(*args):
   """
-    svn_diff_file_output_unified3(svn_stream_t output_stream, svn_diff_t diff, char original_path, 
-        char modified_path, char original_header, 
-        char modified_header, char header_encoding, 
-        char relative_to_dir, svn_boolean_t show_c_function, 
+    svn_diff_file_output_unified3(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
+        char const * original_header, char const * modified_header, 
+        char const * header_encoding, char const * relative_to_dir, svn_boolean_t show_c_function, 
         apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_file_output_unified3(*args)
 
 def svn_diff_file_output_unified2(*args):
   """
-    svn_diff_file_output_unified2(svn_stream_t output_stream, svn_diff_t diff, char original_path, 
-        char modified_path, char original_header, 
-        char modified_header, char header_encoding, 
-        apr_pool_t pool) -> svn_error_t
+    svn_diff_file_output_unified2(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
+        char const * original_header, char const * modified_header, 
+        char const * header_encoding, apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_file_output_unified2(*args)
 
 def svn_diff_file_output_unified(*args):
   """
-    svn_diff_file_output_unified(svn_stream_t output_stream, svn_diff_t diff, char original_path, 
-        char modified_path, char original_header, 
-        char modified_header, apr_pool_t pool) -> svn_error_t
+    svn_diff_file_output_unified(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
+        char const * original_header, char const * modified_header, 
+        apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_file_output_unified(*args)
 
 def svn_diff_file_output_merge2(*args):
   """
-    svn_diff_file_output_merge2(svn_stream_t output_stream, svn_diff_t diff, char original_path, 
-        char modified_path, char latest_path, 
-        char conflict_original, char conflict_modified, 
-        char conflict_latest, char conflict_separator, 
+    svn_diff_file_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
+        char const * latest_path, char const * conflict_original, 
+        char const * conflict_modified, char const * conflict_latest, char const * conflict_separator, 
         svn_diff_conflict_display_style_t conflict_style, 
         apr_pool_t pool) -> svn_error_t
     """
@@ -553,78 +544,69 @@ def svn_diff_file_output_merge2(*args):
 
 def svn_diff_file_output_merge(*args):
   """
-    svn_diff_file_output_merge(svn_stream_t output_stream, svn_diff_t diff, char original_path, 
-        char modified_path, char latest_path, 
-        char conflict_original, char conflict_modified, 
-        char conflict_latest, char conflict_separator, 
-        svn_boolean_t display_original_in_conflict, 
-        svn_boolean_t display_resolved_conflicts, 
+    svn_diff_file_output_merge(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
+        char const * latest_path, char const * conflict_original, 
+        char const * conflict_modified, char const * conflict_latest, char const * conflict_separator, 
+        svn_boolean_t display_original_in_conflict, svn_boolean_t display_resolved_conflicts, 
         apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_file_output_merge(*args)
 
 def svn_diff_mem_string_diff(*args):
   """
-    svn_diff_mem_string_diff(svn_string_t original, svn_string_t modified, svn_diff_file_options_t options, 
+    svn_diff_mem_string_diff(svn_string_t const * original, svn_string_t const * modified, svn_diff_file_options_t options, 
         apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_mem_string_diff(*args)
 
 def svn_diff_mem_string_diff3(*args):
   """
-    svn_diff_mem_string_diff3(svn_string_t original, svn_string_t modified, svn_string_t latest, 
-        svn_diff_file_options_t options, 
-        apr_pool_t pool) -> svn_error_t
+    svn_diff_mem_string_diff3(svn_string_t const * original, svn_string_t const * modified, svn_string_t const * latest, 
+        svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_mem_string_diff3(*args)
 
 def svn_diff_mem_string_diff4(*args):
   """
-    svn_diff_mem_string_diff4(svn_string_t original, svn_string_t modified, svn_string_t latest, 
-        svn_string_t ancestor, svn_diff_file_options_t options, 
-        apr_pool_t pool) -> svn_error_t
+    svn_diff_mem_string_diff4(svn_string_t const * original, svn_string_t const * modified, svn_string_t const * latest, 
+        svn_string_t const * ancestor, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_mem_string_diff4(*args)
 
 def svn_diff_mem_string_output_unified2(*args):
   """
-    svn_diff_mem_string_output_unified2(svn_stream_t output_stream, svn_diff_t diff, svn_boolean_t with_diff_header, 
-        char hunk_delimiter, 
-        char original_header, char modified_header, 
-        char header_encoding, svn_string_t original, 
-        svn_string_t modified, apr_pool_t pool) -> svn_error_t
+    svn_diff_mem_string_output_unified2(svn_stream_t * output_stream, svn_diff_t * diff, svn_boolean_t with_diff_header, 
+        char const * hunk_delimiter, char const * original_header, char const * modified_header, 
+        char const * header_encoding, svn_string_t const * original, 
+        svn_string_t const * modified, apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_mem_string_output_unified2(*args)
 
 def svn_diff_mem_string_output_unified(*args):
   """
-    svn_diff_mem_string_output_unified(svn_stream_t output_stream, svn_diff_t diff, char original_header, 
-        char modified_header, char header_encoding, 
-        svn_string_t original, svn_string_t modified, 
-        apr_pool_t pool) -> svn_error_t
+    svn_diff_mem_string_output_unified(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_header, char const * modified_header, 
+        char const * header_encoding, svn_string_t const * original, 
+        svn_string_t const * modified, apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_mem_string_output_unified(*args)
 
 def svn_diff_mem_string_output_merge2(*args):
   """
-    svn_diff_mem_string_output_merge2(svn_stream_t output_stream, svn_diff_t diff, svn_string_t original, 
-        svn_string_t modified, svn_string_t latest, 
-        char conflict_original, char conflict_modified, 
-        char conflict_latest, char conflict_separator, 
-        svn_diff_conflict_display_style_t style, 
+    svn_diff_mem_string_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, 
+        svn_string_t const * latest, char const * conflict_original, 
+        char const * conflict_modified, char const * conflict_latest, 
+        char const * conflict_separator, svn_diff_conflict_display_style_t style, 
         apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_mem_string_output_merge2(*args)
 
 def svn_diff_mem_string_output_merge(*args):
   """
-    svn_diff_mem_string_output_merge(svn_stream_t output_stream, svn_diff_t diff, svn_string_t original, 
-        svn_string_t modified, svn_string_t latest, 
-        char conflict_original, char conflict_modified, 
-        char conflict_latest, char conflict_separator, 
-        svn_boolean_t display_original_in_conflict, 
-        svn_boolean_t display_resolved_conflicts, 
-        apr_pool_t pool) -> svn_error_t
+    svn_diff_mem_string_output_merge(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, 
+        svn_string_t const * latest, char const * conflict_original, 
+        char const * conflict_modified, char const * conflict_latest, 
+        char const * conflict_separator, svn_boolean_t display_original_in_conflict, 
+        svn_boolean_t display_resolved_conflicts, apr_pool_t pool) -> svn_error_t
     """
   return _diff.svn_diff_mem_string_output_merge(*args)
 svn_diff_op_unchanged = _diff.svn_diff_op_unchanged
@@ -635,51 +617,51 @@ svn_diff_op_moved = _diff.svn_diff_op_moved
 svn_diff_op_modified = _diff.svn_diff_op_modified
 
 def svn_diff_hunk_readline_diff_text(*args):
-  """svn_diff_hunk_readline_diff_text(svn_diff_hunk_t hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  """svn_diff_hunk_readline_diff_text(svn_diff_hunk_t * hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
   return _diff.svn_diff_hunk_readline_diff_text(*args)
 
 def svn_diff_hunk_readline_original_text(*args):
-  """svn_diff_hunk_readline_original_text(svn_diff_hunk_t hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  """svn_diff_hunk_readline_original_text(svn_diff_hunk_t * hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
   return _diff.svn_diff_hunk_readline_original_text(*args)
 
 def svn_diff_hunk_readline_modified_text(*args):
-  """svn_diff_hunk_readline_modified_text(svn_diff_hunk_t hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  """svn_diff_hunk_readline_modified_text(svn_diff_hunk_t * hunk, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
   return _diff.svn_diff_hunk_readline_modified_text(*args)
 
 def svn_diff_hunk_reset_diff_text(*args):
-  """svn_diff_hunk_reset_diff_text(svn_diff_hunk_t hunk)"""
+  """svn_diff_hunk_reset_diff_text(svn_diff_hunk_t * hunk)"""
   return _diff.svn_diff_hunk_reset_diff_text(*args)
 
 def svn_diff_hunk_reset_original_text(*args):
-  """svn_diff_hunk_reset_original_text(svn_diff_hunk_t hunk)"""
+  """svn_diff_hunk_reset_original_text(svn_diff_hunk_t * hunk)"""
   return _diff.svn_diff_hunk_reset_original_text(*args)
 
 def svn_diff_hunk_reset_modified_text(*args):
-  """svn_diff_hunk_reset_modified_text(svn_diff_hunk_t hunk)"""
+  """svn_diff_hunk_reset_modified_text(svn_diff_hunk_t * hunk)"""
   return _diff.svn_diff_hunk_reset_modified_text(*args)
 
 def svn_diff_hunk_get_original_start(*args):
-  """svn_diff_hunk_get_original_start(svn_diff_hunk_t hunk) -> svn_linenum_t"""
+  """svn_diff_hunk_get_original_start(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
   return _diff.svn_diff_hunk_get_original_start(*args)
 
 def svn_diff_hunk_get_original_length(*args):
-  """svn_diff_hunk_get_original_length(svn_diff_hunk_t hunk) -> svn_linenum_t"""
+  """svn_diff_hunk_get_original_length(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
   return _diff.svn_diff_hunk_get_original_length(*args)
 
 def svn_diff_hunk_get_modified_start(*args):
-  """svn_diff_hunk_get_modified_start(svn_diff_hunk_t hunk) -> svn_linenum_t"""
+  """svn_diff_hunk_get_modified_start(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
   return _diff.svn_diff_hunk_get_modified_start(*args)
 
 def svn_diff_hunk_get_modified_length(*args):
-  """svn_diff_hunk_get_modified_length(svn_diff_hunk_t hunk) -> svn_linenum_t"""
+  """svn_diff_hunk_get_modified_length(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
   return _diff.svn_diff_hunk_get_modified_length(*args)
 
 def svn_diff_hunk_get_leading_context(*args):
-  """svn_diff_hunk_get_leading_context(svn_diff_hunk_t hunk) -> svn_linenum_t"""
+  """svn_diff_hunk_get_leading_context(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
   return _diff.svn_diff_hunk_get_leading_context(*args)
 
 def svn_diff_hunk_get_trailing_context(*args):
-  """svn_diff_hunk_get_trailing_context(svn_diff_hunk_t hunk) -> svn_linenum_t"""
+  """svn_diff_hunk_get_trailing_context(svn_diff_hunk_t const * hunk) -> svn_linenum_t"""
   return _diff.svn_diff_hunk_get_trailing_context(*args)
 class svn_prop_patch_t:
     """Proxy of C svn_prop_patch_t struct"""
@@ -737,7 +719,7 @@ class svn_prop_patch_t:
       return _swig_setattr(self, self.__class__, name, value)
 
     def __init__(self): 
-        """__init__(self) -> svn_prop_patch_t"""
+        """__init__(svn_prop_patch_t self) -> svn_prop_patch_t"""
         this = _diff.new_svn_prop_patch_t()
         try: self.this.append(this)
         except: self.this = this
@@ -808,7 +790,7 @@ class svn_patch_t:
       return _swig_setattr(self, self.__class__, name, value)
 
     def __init__(self): 
-        """__init__(self) -> svn_patch_t"""
+        """__init__(svn_patch_t self) -> svn_patch_t"""
         this = _diff.new_svn_patch_t()
         try: self.this.append(this)
         except: self.this = this
@@ -819,19 +801,18 @@ svn_patch_t_swigregister(svn_patch_t)
 
 
 def svn_diff_open_patch_file(*args):
-  """svn_diff_open_patch_file(char local_abspath, apr_pool_t result_pool) -> svn_error_t"""
+  """svn_diff_open_patch_file(char const * local_abspath, apr_pool_t result_pool) -> svn_error_t"""
   return _diff.svn_diff_open_patch_file(*args)
 
 def svn_diff_parse_next_patch(*args):
   """
-    svn_diff_parse_next_patch(svn_patch_file_t patch_file, svn_boolean_t reverse, 
-        svn_boolean_t ignore_whitespace, apr_pool_t result_pool, 
-        apr_pool_t scratch_pool) -> svn_error_t
+    svn_diff_parse_next_patch(svn_patch_file_t * patch_file, svn_boolean_t reverse, svn_boolean_t ignore_whitespace, 
+        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
     """
   return _diff.svn_diff_parse_next_patch(*args)
 
 def svn_diff_close_patch_file(*args):
-  """svn_diff_close_patch_file(svn_patch_file_t patch_file, apr_pool_t scratch_pool) -> svn_error_t"""
+  """svn_diff_close_patch_file(svn_patch_file_t * patch_file, apr_pool_t scratch_pool) -> svn_error_t"""
   return _diff.svn_diff_close_patch_file(*args)
 class svn_diff_t:
     """Proxy of C svn_diff_t struct"""
@@ -995,105 +976,92 @@ svn_patch_file_t_swigregister(svn_patch_file_t)
 
 def svn_diff_fns2_invoke_datasources_open(*args):
   """
-    svn_diff_fns2_invoke_datasources_open(svn_diff_fns2_t _obj, void diff_baton, apr_off_t prefix_lines, 
-        apr_off_t suffix_lines, svn_diff_datasource_e datasources, 
-        apr_size_t datasources_len) -> svn_error_t
+    svn_diff_fns2_invoke_datasources_open(svn_diff_fns2_t _obj, void * diff_baton, apr_off_t * prefix_lines, apr_off_t * suffix_lines, 
+        svn_diff_datasource_e const * datasources, apr_size_t datasources_len) -> svn_error_t
     """
   return _diff.svn_diff_fns2_invoke_datasources_open(*args)
 
 def svn_diff_fns2_invoke_datasource_close(*args):
-  """svn_diff_fns2_invoke_datasource_close(svn_diff_fns2_t _obj, void diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
+  """svn_diff_fns2_invoke_datasource_close(svn_diff_fns2_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
   return _diff.svn_diff_fns2_invoke_datasource_close(*args)
 
 def svn_diff_fns2_invoke_datasource_get_next_token(*args):
-  """svn_diff_fns2_invoke_datasource_get_next_token(svn_diff_fns2_t _obj, void diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
+  """svn_diff_fns2_invoke_datasource_get_next_token(svn_diff_fns2_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
   return _diff.svn_diff_fns2_invoke_datasource_get_next_token(*args)
 
 def svn_diff_fns2_invoke_token_compare(*args):
-  """
-    svn_diff_fns2_invoke_token_compare(svn_diff_fns2_t _obj, void diff_baton, void ltoken, 
-        void rtoken) -> svn_error_t
-    """
+  """svn_diff_fns2_invoke_token_compare(svn_diff_fns2_t _obj, void * diff_baton, void * ltoken, void * rtoken) -> svn_error_t"""
   return _diff.svn_diff_fns2_invoke_token_compare(*args)
 
 def svn_diff_fns2_invoke_token_discard(*args):
-  """svn_diff_fns2_invoke_token_discard(svn_diff_fns2_t _obj, void diff_baton, void token)"""
+  """svn_diff_fns2_invoke_token_discard(svn_diff_fns2_t _obj, void * diff_baton, void * token)"""
   return _diff.svn_diff_fns2_invoke_token_discard(*args)
 
 def svn_diff_fns2_invoke_token_discard_all(*args):
-  """svn_diff_fns2_invoke_token_discard_all(svn_diff_fns2_t _obj, void diff_baton)"""
+  """svn_diff_fns2_invoke_token_discard_all(svn_diff_fns2_t _obj, void * diff_baton)"""
   return _diff.svn_diff_fns2_invoke_token_discard_all(*args)
 
 def svn_diff_fns_invoke_datasource_open(*args):
-  """svn_diff_fns_invoke_datasource_open(svn_diff_fns_t _obj, void diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
+  """svn_diff_fns_invoke_datasource_open(svn_diff_fns_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
   return _diff.svn_diff_fns_invoke_datasource_open(*args)
 
 def svn_diff_fns_invoke_datasource_close(*args):
-  """svn_diff_fns_invoke_datasource_close(svn_diff_fns_t _obj, void diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
+  """svn_diff_fns_invoke_datasource_close(svn_diff_fns_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
   return _diff.svn_diff_fns_invoke_datasource_close(*args)
 
 def svn_diff_fns_invoke_datasource_get_next_token(*args):
-  """svn_diff_fns_invoke_datasource_get_next_token(svn_diff_fns_t _obj, void diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
+  """svn_diff_fns_invoke_datasource_get_next_token(svn_diff_fns_t _obj, void * diff_baton, svn_diff_datasource_e datasource) -> svn_error_t"""
   return _diff.svn_diff_fns_invoke_datasource_get_next_token(*args)
 
 def svn_diff_fns_invoke_token_compare(*args):
-  """
-    svn_diff_fns_invoke_token_compare(svn_diff_fns_t _obj, void diff_baton, void ltoken, 
-        void rtoken) -> svn_error_t
-    """
+  """svn_diff_fns_invoke_token_compare(svn_diff_fns_t _obj, void * diff_baton, void * ltoken, void * rtoken) -> svn_error_t"""
   return _diff.svn_diff_fns_invoke_token_compare(*args)
 
 def svn_diff_fns_invoke_token_discard(*args):
-  """svn_diff_fns_invoke_token_discard(svn_diff_fns_t _obj, void diff_baton, void token)"""
+  """svn_diff_fns_invoke_token_discard(svn_diff_fns_t _obj, void * diff_baton, void * token)"""
   return _diff.svn_diff_fns_invoke_token_discard(*args)
 
 def svn_diff_fns_invoke_token_discard_all(*args):
-  """svn_diff_fns_invoke_token_discard_all(svn_diff_fns_t _obj, void diff_baton)"""
+  """svn_diff_fns_invoke_token_discard_all(svn_diff_fns_t _obj, void * diff_baton)"""
   return _diff.svn_diff_fns_invoke_token_discard_all(*args)
 
 def svn_diff_output_fns_invoke_output_common(*args):
   """
-    svn_diff_output_fns_invoke_output_common(svn_diff_output_fns_t _obj, void output_baton, apr_off_t original_start, 
-        apr_off_t original_length, 
-        apr_off_t modified_start, apr_off_t modified_length, 
-        apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t
+    svn_diff_output_fns_invoke_output_common(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, 
+        apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, 
+        apr_off_t latest_length) -> svn_error_t
     """
   return _diff.svn_diff_output_fns_invoke_output_common(*args)
 
 def svn_diff_output_fns_invoke_output_diff_modified(*args):
   """
-    svn_diff_output_fns_invoke_output_diff_modified(svn_diff_output_fns_t _obj, void output_baton, apr_off_t original_start, 
-        apr_off_t original_length, 
-        apr_off_t modified_start, apr_off_t modified_length, 
-        apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t
+    svn_diff_output_fns_invoke_output_diff_modified(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, 
+        apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, 
+        apr_off_t latest_length) -> svn_error_t
     """
   return _diff.svn_diff_output_fns_invoke_output_diff_modified(*args)
 
 def svn_diff_output_fns_invoke_output_diff_latest(*args):
   """
-    svn_diff_output_fns_invoke_output_diff_latest(svn_diff_output_fns_t _obj, void output_baton, apr_off_t original_start, 
-        apr_off_t original_length, 
-        apr_off_t modified_start, apr_off_t modified_length, 
-        apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t
+    svn_diff_output_fns_invoke_output_diff_latest(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, 
+        apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, 
+        apr_off_t latest_length) -> svn_error_t
     """
   return _diff.svn_diff_output_fns_invoke_output_diff_latest(*args)
 
 def svn_diff_output_fns_invoke_output_diff_common(*args):
   """
-    svn_diff_output_fns_invoke_output_diff_common(svn_diff_output_fns_t _obj, void output_baton, apr_off_t original_start, 
-        apr_off_t original_length, 
-        apr_off_t modified_start, apr_off_t modified_length, 
-        apr_off_t latest_start, apr_off_t latest_length) -> svn_error_t
+    svn_diff_output_fns_invoke_output_diff_common(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, 
+        apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, 
+        apr_off_t latest_length) -> svn_error_t
     """
   return _diff.svn_diff_output_fns_invoke_output_diff_common(*args)
 
 def svn_diff_output_fns_invoke_output_conflict(*args):
   """
-    svn_diff_output_fns_invoke_output_conflict(svn_diff_output_fns_t _obj, void output_baton, apr_off_t original_start, 
-        apr_off_t original_length, 
-        apr_off_t modified_start, apr_off_t modified_length, 
-        apr_off_t latest_start, apr_off_t latest_length, 
-        svn_diff_t resolved_diff) -> svn_error_t
+    svn_diff_output_fns_invoke_output_conflict(svn_diff_output_fns_t _obj, void * output_baton, apr_off_t original_start, apr_off_t original_length, 
+        apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, 
+        apr_off_t latest_length, svn_diff_t * resolved_diff) -> svn_error_t
     """
   return _diff.svn_diff_output_fns_invoke_output_conflict(*args)
 # This file is compatible with both classic and new-style classes.