The smallest changes I could think of to get the tests passing again.
Specifically,
this patch doesn't expose the new functionality.
[[[
declare a default for preserve_exts and call the function with it in the
correct place
* subversion/bindings/swig/ruby/svn/wc.rb
(update_editor,switch_editor):
Declare preserved_exts and set to nil. Call the Wc function with this new
parameter in the correct place.
]]]
Index: subversion/bindings/swig/ruby/svn/wc.rb
===================================================================
--- subversion/bindings/swig/ruby/svn/wc.rb (revision 25251)
+++ subversion/bindings/swig/ruby/svn/wc.rb (working copy)
@@ -298,12 +298,13 @@
def update_editor(target_revision, target, use_commit_times=true,
depth=nil, allow_unver_obstruction=false,
diff3_cmd=nil,
notify_func=nil, cancel_func=nil, traversal_info=nil)
+ preserved_exts=nil
traversal_info ||= _traversal_info
results = Wc.get_update_editor3(target_revision, self, target,
use_commit_times, depth,
allow_unver_obstruction,
notify_func, cancel_func, diff3_cmd,
- traversal_info)
+ preserved_exts, traversal_info)
target_revision_address, editor, editor_baton = results
editor.__send__(:target_revision_address=, target_revision_address)
editor.baton = editor_baton
@@ -314,12 +315,14 @@
use_commit_times=true, depth=nil,
allow_unver_obstruction=false, diff3_cmd=nil,
notify_func=nil, cancel_func=nil, traversal_info=nil)
+ preserved_exts=nil
traversal_info ||= _traversal_info
results = Wc.get_switch_editor3(target_revision, self, target,
switch_url, use_commit_times, depth,
allow_unver_obstruction,
notify_func, cancel_func,
- diff3_cmd, traversal_info)
+ diff3_cmd, preserved_exts,
+ traversal_info)
target_revision_address, editor, editor_baton = results
editor.__send__(:target_revision_address=, target_revision_address)
editor.baton = editor_baton
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 1 07:25:38 2007