[svk-commit] r2145 - in trunk: lib/SVK/Command t

[jesse at bestpractical.com]

Author: jesse
Date: Wed Nov 15 21:57:56 2006
New Revision: 2145

Modified:
   trunk/   (props changed)
   trunk/lib/SVK/Command/Copy.pm
   trunk/t/12copy.t

Log:


Modified: trunk/lib/SVK/Command/Copy.pm
==============================================================================
--- trunk/lib/SVK/Command/Copy.pm	(original)
+++ trunk/lib/SVK/Command/Copy.pm	Wed Nov 15 21:57:56 2006
@@ -155,7 +155,7 @@
     my $m = $self->under_mirror($dst);
     if ( $m && !$dst->same_source(@src) ) {
         print loc("You are trying to copy across different mirrors.\n");
-        die loc( "Try create an empty directory %1, and run smerge --baseless %2 %3.\n",
+        die loc( "Create an empty directory %1, and run smerge --baseless %2 %3.\n",
             $dst->report, $src[0]->report, $dst->report )
           if $#src == 0 && $dst->isa('SVK::Path');
         return 1;

Modified: trunk/t/12copy.t
==============================================================================
--- trunk/t/12copy.t	(original)
+++ trunk/t/12copy.t	Wed Nov 15 21:57:56 2006
@@ -130,7 +130,7 @@
 
 is_output ($svk, 'cp', ['//V/new', '//foo-remote/new'],
 	   ['You are trying to copy across different mirrors.',
-	    'Try create an empty directory //foo-remote/new, and run smerge --baseless //V/new //foo-remote/new.']);
+	    'Create an empty directory //foo-remote/new, and run smerge --baseless //V/new //foo-remote/new.']);
 
 is_output ($svk, 'cp', ['-m', 'copy directly', '//V/me', '//V/me-dcopied'],
 	   ['Committed revision 15.']);