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

[nobody at bestpractical.com]

Author: ruz
Date: Tue May  6 19:50:34 2008
New Revision: 2808

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

Log:
* bump changes if we merged something even if it's a skip

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 May  6 19:50:34 2008
@@ -263,6 +263,7 @@
         my $action = SVK::PathResolve->new->add_file($path);
         if ( $action eq 's' ) {
             ++$self->{skipped};
+            ++$self->{changes}; # we do want to write a merge ticket
             $self->{notify}->flush ($path);
             return undef;
         }
@@ -643,6 +644,7 @@
         my $action = SVK::PathResolve->new->add_directory($path);
         if ( $action eq 's' ) {
             ++$self->{skipped};
+            ++$self->{changes};
             $self->{notify}->node_status ($path, '');
             return undef;
         }