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

[nobody at bestpractical.com]

Author: ruz
Date: Tue Apr 22 06:03:07 2008
New Revision: 2751

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

Log:
* finally tie it all together

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 06:03:07 2008
@@ -754,10 +754,16 @@
 
 	my ($basepath, $fromrev, $inspector) = $self->resolve_base($path);
 
-	unless ($inspector->exist($basepath, $pool) || $self->{open_nonexist}) {
-	    ++$self->{skipped};
-	    $self->{notify}->flush ($path);
-	    return undef;
+	unless ($inspector->exist($basepath, $pool)) {
+            # XXX: hackish check but resolve only exist when
+            # we want interactivity
+            if ($self->{resolve}) {
+                $self->{return_back}{$path} = 1;
+                return $path;
+            } else {
+                $self->node_conflict($path);
+                return undef;
+            }
 	}
     }
     $self->{notify}->node_status ($path, '');