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

[nobody at bestpractical.com]

Author: clsung
Date: Thu Nov  8 04:08:41 2007
New Revision: 2593

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

Log:
- fix the --move need to call twice (when local to remote)
- check the branch existence before we move to it 

Modified: branches/bm/lib/SVK/Command/Branch.pm
==============================================================================
--- branches/bm/lib/SVK/Command/Branch.pm	(original)
+++ branches/bm/lib/SVK/Command/Branch.pm	Thu Nov  8 04:08:41 2007
@@ -217,6 +217,9 @@
 
     $src = $self->arg_uri_maybe($src_branch_path);
     $dst = $self->arg_depotpath($dst_branch_path);
+    $SVN::Node::none == $dst->root->check_path($dst->path)
+	or die loc("Project branch already exists: %1 %2\n",
+	    $branch_path, $self->{local} ? '(in local)' : '');
 
     $self->{parent} = 1;
     if ( !$dst->same_source($src) ) {
@@ -229,7 +232,9 @@
 	# now we do sm -I
 	$src = $self->arg_uri_maybe($src_branch_path);
 	$self->{message} = ''; # incremental does not need message
+	# w/o reassign $dst = ..., we will have changes 'XXX - skipped'
 	$dst->refresh_revision;
+	$dst = $self->arg_depotpath($dst_branch_path);
 	$self->{incremental} = 1;
 	my $ret = $self->SVK::Command::Smerge::run($src, $dst);
 	return;