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

[nobody at bestpractical.com]

Author: clsung
Date: Fri Nov  9 00:49:57 2007
New Revision: 2594

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

Log:
- After SM-ed, delete the orig branch

Modified: branches/bm/lib/SVK/Command/Branch.pm
==============================================================================
--- branches/bm/lib/SVK/Command/Branch.pm	(original)
+++ branches/bm/lib/SVK/Command/Branch.pm	Fri Nov  9 00:49:57 2007
@@ -178,7 +178,7 @@
 }
 
 package SVK::Command::Branch::move;
-use base qw( SVK::Command::Copy SVK::Command::Smerge SVK::Command::Move SVK::Command::Branch );
+use base qw( SVK::Command::Copy SVK::Command::Smerge SVK::Command::Move SVK::Command::Delete SVK::Command::Branch );
 use SVK::I18N;
 use SVK::Util qw( is_uri );
 
@@ -236,7 +236,9 @@
 	$dst->refresh_revision;
 	$dst = $self->arg_depotpath($dst_branch_path);
 	$self->{incremental} = 1;
-	my $ret = $self->SVK::Command::Smerge::run($src, $dst);
+	$self->SVK::Command::Smerge::run($src, $dst);
+	$self->{message} = "- Delete branch $src_branch_path, because it move to $dst_branch_path";
+	$self->SVK::Command::Delete::run($src, $target);
 	return;
     }
     $self->{message} = "- Move branch $src_branch_path to $dst_branch_path";