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

[nobody at bestpractical.com]

Author: clkao
Date: Wed Nov 14 08:43:21 2007
New Revision: 2606

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

Log:
fix merge multiple branches in check_only mode.

Modified: branches/bm/lib/SVK/Command/Branch.pm
==============================================================================
--- branches/bm/lib/SVK/Command/Branch.pm	(original)
+++ branches/bm/lib/SVK/Command/Branch.pm	Wed Nov 14 08:43:21 2007
@@ -345,6 +345,14 @@
 
     $dst = $self->arg_depotpath($dst_branch_path);
 
+    # see also check_only in incmrental smerge.  this should be a
+    # better api in svk::path
+    if ($self->{check_only}) {
+        require SVK::Path::Txn;
+        $dst = $dst->clone;
+        bless $dst, 'SVK::Path::Txn'; # XXX: need a saner api for this
+    }
+
     for my $src (@srcs) {
 	my $src_branch_path = $branch_path.'/'.$src;
 	$src_branch_path =  '/'.$proj->depot->depotname.'/'.$proj->trunk