[svk-commit] r2225 - branches/2.0-releng/lib/SVK/Command

[nobody at bestpractical.com]

Author: clkao
Date: Fri Dec  8 04:32:22 2006
New Revision: 2225

Modified:
   branches/2.0-releng/lib/SVK/Command/Merge.pm

Log:
Disallow merge with just one revision number rather than a range.

Modified: branches/2.0-releng/lib/SVK/Command/Merge.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Command/Merge.pm	(original)
+++ branches/2.0-releng/lib/SVK/Command/Merge.pm	Fri Dec  8 04:32:22 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,