[svk-commit] r2964 - trunk/lib/SVK

[nobody at bestpractical.com]

Author: ruz
Date: Fri Jul  4 07:55:58 2008
New Revision: 2964

Modified:
   trunk/lib/SVK/XD.pm

Log:
* `svk resolved` should resolve any conflicts at this point

Modified: trunk/lib/SVK/XD.pm
==============================================================================
--- trunk/lib/SVK/XD.pm	(original)
+++ trunk/lib/SVK/XD.pm	Fri Jul  4 07:55:58 2008
@@ -1643,7 +1643,7 @@
     my ($self, %arg) = @_;
 
     if ($arg{recursive}) {
-	for ($self->{checkout}->find ($arg{copath}, {'.conflict' => 1})) {
+	for ($self->{checkout}->find ($arg{copath}, {'.conflict' => qr/.*/})) {
 	    $self->resolved_entry ($_);
 	}
     }