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

[nobody at bestpractical.com]

Author: ruz
Date: Fri Jul  4 07:40:28 2008
New Revision: 2961

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

Log:
* call cb_conflict from Editor::Merge with additional argument
  defining type of the conflict

Modified: trunk/lib/SVK/Editor/Merge.pm
==============================================================================
--- trunk/lib/SVK/Editor/Merge.pm	(original)
+++ trunk/lib/SVK/Editor/Merge.pm	Fri Jul  4 07:40:28 2008
@@ -145,7 +145,9 @@
 
 =item cb_conflict
 
-Called when a conflict is detected.
+When a conflict is detected called with path and conflict
+type as argument. At this point type can be either 'node' or
+'prop'.
 
 =item cb_prop_merged
 
@@ -380,7 +382,7 @@
 
 sub node_conflict {
     my ($self, $path) = @_;
-    $self->{cb_conflict}->($path) if $self->{cb_conflict};
+    $self->{cb_conflict}->($path, 'node') if $self->{cb_conflict};
     ++$self->{conflicts};
     $self->{notify}->node_status ($path, 'C');
 }
@@ -993,7 +995,7 @@
     }
     else {
         if ($status eq 'C') {
-            $self->{cb_conflict}->($path, $_[0]) if $self->{cb_conflict};
+            $self->{cb_conflict}->($path, 'prop') if $self->{cb_conflict};
             ++$self->{conflicts};
         }
 	$_[1] = $merged;