[svk-commit] r2747 - branches/path-resolver/lib/SVK/Editor

[nobody at bestpractical.com]

Author: ruz
Date: Tue Apr 22 05:47:15 2008
New Revision: 2747

Modified:
   branches/path-resolver/lib/SVK/Editor/Merge.pm

Log:
* no more skipping by default for dirs

Modified: branches/path-resolver/lib/SVK/Editor/Merge.pm
==============================================================================
--- branches/path-resolver/lib/SVK/Editor/Merge.pm	(original)
+++ branches/path-resolver/lib/SVK/Editor/Merge.pm	Tue Apr 22 05:47:15 2008
@@ -631,11 +631,11 @@
 
 sub add_directory {
     my ($self, $path, $pdir, @arg) = @_;
-    unless ( defined $pdir ) {
-        ++$self->{skipped};
-        $self->{notify}->flush ($path);
+    unless (defined $pdir) {
+        $self->node_conflict($path);
         return undef;
     }
+
     my $pool = pop @arg;
     my $touched = $self->{notify}->node_status($path);
     # This comes from R (D+A) where the D has conflict