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

[nobody at bestpractical.com]

Author: clkao
Date: Fri Dec  8 04:52:47 2006
New Revision: 2230

Modified:
   trunk/   (props changed)
   trunk/lib/SVK/Command/Merge.pm

Log:
 r7389 at lofoten (orig r2225):  clkao | 2006-12-08 17:32:22 +0800
 Disallow merge with just one revision number rather than a range.


Modified: trunk/lib/SVK/Command/Merge.pm
==============================================================================
--- trunk/lib/SVK/Command/Merge.pm	(original)
+++ trunk/lib/SVK/Command/Merge.pm	Fri Dec  8 04:52:47 2006
@@ -177,6 +177,8 @@
 	my @revlist = $self->parse_revlist($src);
 	die "multi-merge not yet" if $#revlist > 0;
 	my ($baserev, $torev) = @{$revlist[0]};
+	die loc("Merge requires a range of revision.\n")
+	    unless defined $baserev && defined $torev;
 	$merge = SVK::Merge->new
 	    (%$self, repos => $repos, src => $src->new (revision => $torev),
 	     dst => $dst,