[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    
From:       hwright () tigris ! org
Date:       2008-04-30 2:23:24
Message-ID: 200804300223.m3U2NOwM001386 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: hwright
Date: Tue Apr 29 19:23:24 2008
New Revision: 30857

Log:
Merge r29632 from trunk:

 * r29632
   Add optional pool parameter to the Editor methods missing it, matching
   the rest (not to mention the C API!).
   Votes:
     +1: epg, hwright

Modified:
   branches/1.5.x/   (props changed)
   branches/1.5.x/CHANGES   (props changed)
   branches/1.5.x/STATUS
   branches/1.5.x/subversion/bindings/swig/python/svn/delta.py

Merged:
   /trunk:r29632

Modified: branches/1.5.x/STATUS
URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/STATUS?pathrev=30857&r1=30856&r2=30857
 ==============================================================================
--- branches/1.5.x/STATUS	Tue Apr 29 19:21:27 2008	(r30856)
+++ branches/1.5.x/STATUS	Tue Apr 29 19:23:24 2008	(r30857)
@@ -60,9 +60,3 @@ Approved changes (all releases):
    reintegrate, and quite possibly to other mergeinfo corruption.
    Votes:
      +1: glasser, epg, hwright
-
- * r29632
-   Add optional pool parameter to the Editor methods missing it, matching
-   the rest (not to mention the C API!).
-   Votes:
-     +1: epg, hwright

Modified: branches/1.5.x/subversion/bindings/swig/python/svn/delta.py
URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/bindings/swig/python/svn/delta.py?pathrev=30857&r1=30856&r2=30857
 ==============================================================================
--- branches/1.5.x/subversion/bindings/swig/python/svn/delta.py	Tue Apr 29 19:21:27 \
                2008	(r30856)
+++ branches/1.5.x/subversion/bindings/swig/python/svn/delta.py	Tue Apr 29 19:23:24 \
2008	(r30857) @@ -25,7 +25,7 @@ del _unprefix_names
 
 class Editor:
 
-  def set_target_revision(self, target_revision):
+  def set_target_revision(self, target_revision, pool=None):
     pass
 
   def open_root(self, base_revision, dir_pool=None):
@@ -44,7 +44,7 @@ class Editor:
   def change_dir_prop(self, dir_baton, name, value, pool=None):
     pass
 
-  def close_directory(self, dir_baton):
+  def close_directory(self, dir_baton, pool=None):
     pass
 
   def add_file(self, path, parent_baton,
@@ -54,19 +54,19 @@ class Editor:
   def open_file(self, path, parent_baton, base_revision, file_pool=None):
     return None
 
-  def apply_textdelta(self, file_baton, base_checksum):
+  def apply_textdelta(self, file_baton, base_checksum, pool=None):
     return None
 
   def change_file_prop(self, file_baton, name, value, pool=None):
     pass
 
-  def close_file(self, file_baton, text_checksum):
+  def close_file(self, file_baton, text_checksum, pool=None):
     pass
 
-  def close_edit(self):
+  def close_edit(self, pool=None):
     pass
 
-  def abort_edit(self):
+  def abort_edit(self, pool=None):
     pass
 
 

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]