[svk-commit] r2385 - in trunk/lib/SVK: .

[nobody at bestpractical.com]

Author: clkao
Date: Fri May  4 08:08:20 2007
New Revision: 2385

Modified:
   trunk/lib/SVK/Editor/Tee.pm
   trunk/lib/SVK/Path.pm

Log:
Use SVN::TxDelta::invoke_window_handler instead of SVN::Delta::invoke_window_handler.

Modified: trunk/lib/SVK/Editor/Tee.pm
==============================================================================
--- trunk/lib/SVK/Editor/Tee.pm	(original)
+++ trunk/lib/SVK/Editor/Tee.pm	Fri May  4 08:08:20 2007
@@ -57,7 +57,7 @@
     my ($self, $handlers, $window) = @_;
     for (@$handlers) {
 	next unless $_;
-	SVN::Delta::invoke_window_handler($_->[0], $_->[1], $window);
+	SVN::TxDelta::invoke_window_handler($_->[0], $window, $_->[1]);
     }
 }
 

Modified: trunk/lib/SVK/Path.pm
==============================================================================
--- trunk/lib/SVK/Path.pm	(original)
+++ trunk/lib/SVK/Path.pm	Fri May  4 08:08:20 2007
@@ -269,8 +269,9 @@
     my $post_handler;
     if ($m) {
 	$use_tee = !$arg{notee} &&
-	    SVN::Delta->can('invoke_window_handler') &&
+	    SVN::TxDelta->can('invoke_window_handler') &&
 	    $m->_backend->has_replay;
+	warn 'use tee' if $use_tee;
         my $mcallback = sub {
             my $rev = shift;
             $logger->info( loc( "Merge back committed as revision %1.\n", $rev ) );