[svk-commit] r2895 - in trunk: t/bm

[nobody at bestpractical.com]

Author: clsung
Date: Wed May 21 00:19:39 2008
New Revision: 2895

Modified:
   trunk/lib/SVK/Command/Branch.pm
   trunk/t/bm/move.t

Log:
- fix a bug that --move local to remote didn't actually delete the
  local branch.

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Wed May 21 00:19:39 2008
@@ -350,7 +350,7 @@
 	    $self->{incremental} = 1;
 	    $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);
+	    $self->SVK::Command::Delete::run($src);
 	    $dst->refresh_revision;
 	} else {
 	    $self->{message} = "- Move branch $src_branch_path to $dst_branch_path";

Modified: trunk/t/bm/move.t
==============================================================================
--- trunk/t/bm/move.t	(original)
+++ trunk/t/bm/move.t	Wed May 21 00:19:39 2008
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 use strict;
-use Test::More tests => 17;
+use Test::More tests => 19;
 use SVK::Test;
 use File::Path;
 
@@ -99,7 +99,10 @@
      'Auto-merging (0, 15) /local/MyProject/localbar to /mirror/MyProject/branches/feature/remotefoo (base /mirror/MyProject/trunk:6).',
      '===> Auto-merging (0, 15) /local/MyProject/localbar to /mirror/MyProject/branches/feature/remotefoo (base /mirror/MyProject/trunk:6).',
      "Merging back to mirror source $uri.",'Empty merge.',
-     "Different source."]);
+     "Committed revision 17."]);
+
+is_output ($svk, 'info', ['//local/MyProject/localbar'],
+    ['Path //local/MyProject/localbar does not exist.']);
 
 is_output ($svk, 'branch', ['--list'],
     ['feature/bar','feature/mar','feature/remotebar','feature/remotefoo'],
@@ -111,13 +114,18 @@
      "Merge back committed as revision 14.",
      "Syncing $uri",
      "Retrieving log information from 14 to 14",
-     "Committed revision 18 from revision 14.",
+     "Committed revision 19 from revision 14.",
      "Merging back to mirror source $uri.",
      "Merge back committed as revision 15.",
      "Syncing $uri",
      "Retrieving log information from 15 to 15",
-     "Committed revision 19 from revision 15."]);
+     "Committed revision 20 from revision 15."]);
 
 is_output ($svk, 'branch', ['--list'],
     ['feature/remotebar','feature/remotefoo', 'hasbugs/bar','hasbugs/mar'],
-    'Move localbar to remotefoo, cross depot move w/o switch to local');
+    'Move feature/bar,mar to hasbugs/');
+
+is_output ($svk, 'branch', ['--create', 'localbar', '--local'],
+    ["Committed revision 21.",
+     "Project branch created: localbar (in local)"]);
+