[svk-commit] r2588 - branches/bm/lib/SVK/Command

[nobody at bestpractical.com]

Author: clsung
Date: Mon Nov  5 20:51:52 2007
New Revision: 2588

Modified:
   branches/bm/lib/SVK/Command/Branch.pm

Log:
- fix path, when one of @srcs is 'trunk'

Modified: branches/bm/lib/SVK/Command/Branch.pm
==============================================================================
--- branches/bm/lib/SVK/Command/Branch.pm	(original)
+++ branches/bm/lib/SVK/Command/Branch.pm	Mon Nov  5 20:51:52 2007
@@ -256,6 +256,8 @@
 
     for my $src (@srcs) {
 	my $src_branch_path = $branch_path.'/'.$src;
+	$src_branch_path =  '/'.$proj->depot->depotname.'/'.$proj->trunk
+	    if $src eq 'trunk';
 	$src = $self->arg_depotpath($src_branch_path);
 
 	$self->{message} = "- Merge $src_branch_path to $dst_branch_path";