[svk-commit] r2960 - trunk/lib/SVK/Editor

[nobody at bestpractical.com]

Author: ruz
Date: Fri Jul  4 07:35:09 2008
New Revision: 2960

Modified:
   trunk/lib/SVK/Editor/Merge.pm

Log:
* we don't want to announce prop change if its node has been added,
  as well node is flushed already right after add

Modified: trunk/lib/SVK/Editor/Merge.pm
==============================================================================
--- trunk/lib/SVK/Editor/Merge.pm	(original)
+++ trunk/lib/SVK/Editor/Merge.pm	Fri Jul  4 07:35:09 2008
@@ -967,7 +967,7 @@
     if ($self->{added}{$path} or
 	(!length ($path) and $self->{base_root}->is_revision_root
 	 and $self->{base_root}->revision_root_revision == 0)) {
-	$self->{notify}->prop_status ($path, 'U');
+	$self->{notify}->prop_status ($path, 'U') unless $self->{added}{$path};
 	return 1;
     }
     my $rpath = $self->{base_anchor} eq '/' ? "/$path" : "$self->{base_anchor}/$path";