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

[nobody at bestpractical.com]

Author: ruz
Date: Fri May  9 13:34:56 2008
New Revision: 2846

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

Log:
* if user decided to add file back then don't forget to add file's
  parent directory back when required

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	Fri May  9 13:34:56 2008
@@ -372,6 +372,9 @@
             return undef;
         }
         elsif ( $action eq 'a' ) {
+            $self->add_directory_back( $pool )
+                if $self->{return_back}{$pdir};
+
             $self->{added}{$path} = 1;
             $self->{info}{$path}{overwrite} = 1;
             $self->{info}{$path}{fpool} = $pool;