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

[nobody at bestpractical.com]

Author: clsung
Date: Mon May 12 11:21:20 2008
New Revision: 2870

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

Log:
- --from is removd from --push, so did t/merge.t
- fix bug

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Mon May 12 11:21:20 2008
@@ -531,7 +531,6 @@
 	    die loc("No such branch/tag exists: %1\n", $src->path)
 		if ($SVN::Node::dir != $target->root->check_path($src->path)) ;
 	}
-	$self->{from} = 0;
 	$self->{from_path} = $src->depotpath;
     }
 
@@ -731,7 +730,7 @@
 	last if $trunk_path;
     }
 
-    my $proj = $self->load_project($self->arg_depotpath('/'.$target->_to_pclass($target->depot->depotname)->subdir($preceding_path)));
+    my $proj = $self->load_project($self->arg_depotpath('/'.$target->depot->depotname.$preceding_path));
 
     if ($proj && $fromProp) {
 	$logger->info( loc("Project already set in properties: %1\n", $target->depotpath));

Modified: trunk/t/bm/merge.t
==============================================================================
--- trunk/t/bm/merge.t	(original)
+++ trunk/t/bm/merge.t	Mon May 12 11:21:20 2008
@@ -204,5 +204,5 @@
      "Checking locally against mirror source $uri.", 'U   B/S/Q/qu',
      qr'New merge ticket: [\w\d-]+:/branches/merge/foo3:25']);
 
-is_output ($svk, 'branch', ['--push', '-C', '--from', 'merge/foo3'],
+is_output ($svk, 'branch', ['--push', '-C', 'merge/foo3'],
     [(split /\n/, $pushOutputs)]);