[svk-commit] r2967 - trunk/lib/SVK/Editor

nobody at bestpractical.com nobody at bestpractical.com
Fri Jul 4 08:03:29 EDT 2008


Author: ruz
Date: Fri Jul  4 08:03:29 2008
New Revision: 2967

Modified:
   trunk/lib/SVK/Editor/Status.pm

Log:
* handle new data provided by editor's driver

Modified: trunk/lib/SVK/Editor/Status.pm
==============================================================================
--- trunk/lib/SVK/Editor/Status.pm	(original)
+++ trunk/lib/SVK/Editor/Status.pm	Fri Jul  4 08:03:29 2008
@@ -197,8 +197,11 @@
 }
 
 sub conflict {
-    my ($self, $path) = @_;
-    $self->notify->node_status ($path, 'C');
+    my ($self, $path, $baton, $type) = @_;
+    # backward compatibility
+    $type = 'node' if !$type || $type eq '1';
+    $self->notify->$_ ($path, 'C')
+        foreach map $_ ."_status", split /,/, $type;
 }
 
 sub obstruct {


More information about the svk-commit mailing list