[svk-commit] r2959 - trunk/lib/SVK/Command

[nobody at bestpractical.com]

Author: ruz
Date: Fri Jul  4 07:32:28 2008
New Revision: 2959

Modified:
   trunk/lib/SVK/Command/Commit.pm

Log:
* in general case a property may have conflict when its node is ok.
  we are interested in any conflict, so combine them

Modified: trunk/lib/SVK/Command/Commit.pm
==============================================================================
--- trunk/lib/SVK/Command/Commit.pm	(original)
+++ trunk/lib/SVK/Command/Commit.pm	Fri Jul  4 07:32:28 2008
@@ -324,8 +324,11 @@
             my ($path, $status) = @_;
             to_native ($path, 'path', $encoder);
             my $copath = $target->copath ($path);
-            push @$targets, [$status->[0] || ($status->[1] ? 'P' : ''),
-                $copath];
+            push @$targets, [
+                (($status->[0]||'') eq 'C' || ($status->[1]||'') eq 'C')? 'C'
+                    : ($status->[0] || ($status->[1]? 'P' : '')),
+                $copath
+            ];
             no warnings 'uninitialized';
             push @targets, sprintf ("%1s%1s%1s \%s\n", @{$status}[0..2], $copath);
         }