[svk-commit] r2868 - trunk/lib/SVK/Command

[nobody at bestpractical.com]

Author: clsung
Date: Mon May 12 10:44:45 2008
New Revision: 2868

Modified:
   trunk/lib/SVK/Command/Branch.pm

Log:
- fix when the project is not placed in the mirror root

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Mon May 12 10:44:45 2008
@@ -718,7 +718,6 @@
 sub run {
     my ($self, $target) = @_;
 
-    my $proj = $self->load_project($target);
     my $local_root = $self->arg_depotpath('/'.$target->depot->depotname.'/');
     my ($trunk_path, $branch_path, $tag_path, $project_name, $preceding_path);
 
@@ -732,8 +731,11 @@
 	last if $trunk_path;
     }
 
+    my $proj = $self->load_project($self->arg_depotpath('/'.$target->_to_pclass($target->depot->depotname)->subdir($preceding_path)));
+
     if ($proj && $fromProp) {
 	$logger->info( loc("Project already set in properties: %1\n", $target->depotpath));
+	$project_name = $proj->name;
 	my $proplist = $local_root->root->node_proplist('/');
 	if (!exists $proplist->{"svk:project:$project_name:path-trunk"}) {
 	    my $ans = lc (get_prompt(