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

[clkao at bestpractical.com]

Author: clkao
Date: Mon Nov  6 04:11:52 2006
New Revision: 2114

Modified:
   trunk/   (props changed)
   trunk/lib/SVK/Command/Copy.pm
   trunk/t/10switch.t

Log:
 r7230 at ubuntu:  clkao | 2006-11-06 05:48:05 +0000
 Make -r N@ work with copy.


Modified: trunk/lib/SVK/Command/Copy.pm
==============================================================================
--- trunk/lib/SVK/Command/Copy.pm	(original)
+++ trunk/lib/SVK/Command/Copy.pm	Mon Nov  6 04:11:52 2006
@@ -8,7 +8,7 @@
 sub options {
     ($_[0]->SUPER::options,
      'q|quiet'         => 'quiet',
-     'r|revision=i' => 'rev');
+     'r|revision=s' => 'rev');
 }
 
 sub parse_arg {
@@ -140,8 +140,8 @@
 sub check_src {
     my ($self, @src) = @_;
     for my $src (@src) {
-	# XXX: respect copath rev
-	$src->revision($self->{rev}) if defined $self->{rev};
+	$src->revision($self->resolve_revision($src, $self->{rev})) if defined $self->{rev};
+	$self->apply_revision($src);
 	next unless $src->isa('SVK::Path::Checkout');
 	$self->_unmodified ($src->new);
     }

Modified: trunk/t/10switch.t
==============================================================================
--- trunk/t/10switch.t	(original)
+++ trunk/t/10switch.t	Mon Nov  6 04:11:52 2006
@@ -12,8 +12,8 @@
 my ($copath, $corpath) = get_copath ('switch');
 
 is_output_like ($svk, 'switch', [], qr'SYNOPSIS');
-$svk->cp ('-r1m', 'copy', '//A', '//A-branch');
 
+$svk->cp ('-r1', '-m', 'copy', '//A', '//A-branch');
 $svk->checkout ('//A-branch', $copath);
 
 is_output_like ($svk, 'switch', ['//A-branch', '.', 'foo'], qr'SYNOPSIS');