[svk-commit] r2824 - branches/path-resolver/lib/SVK

nobody at bestpractical.com nobody at bestpractical.com
Wed May 7 21:30:56 EDT 2008


Author: ruz
Date: Wed May  7 21:30:55 2008
New Revision: 2824

Modified:
   branches/path-resolver/lib/SVK/PathResolve.pm

Log:
* add change_file to PathResolve

Modified: branches/path-resolver/lib/SVK/PathResolve.pm
==============================================================================
--- branches/path-resolver/lib/SVK/PathResolve.pm	(original)
+++ branches/path-resolver/lib/SVK/PathResolve.pm	Wed May  7 21:30:55 2008
@@ -44,4 +44,22 @@
     die "help is not implemented yet";
 }
 
+sub change_file {
+    my ($self, $path) = @_;
+    
+    my $default = 'a';
+    my $prompt = loc(
+        "Conflict found in %1:\na)add, s)kip, h)elp? [%2] ",
+        $path, $default
+    );
+
+    my $action = lc(get_prompt(
+        $prompt, qr/^[ash]?/i
+    ) || $default);
+    return $action if $action !~ /^h/;
+
+    die "help is not implemented yet";
+}
+
+
 1;


More information about the svk-commit mailing list