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

[nobody at bestpractical.com]

Author: ruz
Date: Tue Apr 22 05:56:50 2008
New Revision: 2748

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

Log:
* use new path resolver in add_file

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:56:50 2008
@@ -255,11 +255,12 @@
 sub add_file {
     my ($self, $path, $pdir, @arg) = @_;
     unless ( defined $pdir ) {
-#        my $action = get_prompt(
-#            "Parent dir of file $path doesn't exist, what do you want to do?\n"
-#            "a)dd, s)kip", qr/^[as]/i
-#        );
-        my $action = 'a';
+        $self->node_conflict($path);
+        return;
+    }
+    if ($self->{return_back}{$pdir} || $self->{returned_back}{$pdir}) {
+        require SVK::PathResolve;
+        my $action = SVK::PathResolve->new->add_file($path);
         if ( $action eq 's' ) {
             ++$self->{skipped};
             $self->{notify}->flush ($path);