[svk-commit] r2155 - in trunk: t

[clkao at bestpractical.com]

Author: clkao
Date: Fri Nov 17 18:10:10 2006
New Revision: 2155

Modified:
   trunk/lib/SVK/Command/Update.pm
   trunk/t/11checkout.t

Log:
Disallow up -N, as it doesn't update the DH state correctly.

Modified: trunk/lib/SVK/Command/Update.pm
==============================================================================
--- trunk/lib/SVK/Command/Update.pm	(original)
+++ trunk/lib/SVK/Command/Update.pm	Fri Nov 17 18:10:10 2006
@@ -37,6 +37,9 @@
     die loc ("--revision cannot be used in conjunction with --sync or --merge.\n")
 	if defined $self->{rev} && ($self->{merge} || $self->{sync});
 
+    die loc("Non-recursive update not supported.\n")
+	unless $self->{recursive};
+
     for my $target (@arg) {
 	my $update_target = $target->source->new;
 	$update_target->path($self->{update_target_path})

Modified: trunk/t/11checkout.t
==============================================================================
--- trunk/t/11checkout.t	(original)
+++ trunk/t/11checkout.t	Fri Nov 17 18:10:10 2006
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-use Test::More tests => 65;
+use Test::More tests => 66;
 use strict;
 use SVK::Test;
 our($output, $answer);
@@ -39,6 +39,9 @@
 
 is_output ($svk, 'update', ['foo/bar/oz'], ["Path //V-3.1/A/oz does not exist."]);
 is_output ($svk, 'update', ['foo/bar'], ["Syncing //V-3.1/A(/V-3.1/A) in ".__"$corpath/foo/bar to 6."]);
+is_output ($svk, 'update', [-N => -r5 => 'foo/bar/P'],
+	   ['Non-recursive update not supported.']);
+
 is_output ($svk, 'update', [-r5 => 'foo/bar/P'],
 	   ["Syncing //V-3.1/A/P(/V-3.1/A/P) in ".__"$corpath/foo/bar/P to 5.",
 	    __('A   foo/bar/P/pe'),