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

[nobody at bestpractical.com]

Author: clsung
Date: Fri Sep 12 05:01:33 2008
New Revision: 3089

Modified:
   trunk/lib/SVK/Command/Branch.pm
   trunk/t/bm/tag-from-wc.t

Log:
- fix http://task.hm/GN5C

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Fri Sep 12 05:01:33 2008
@@ -318,8 +318,14 @@
 	return;
     }
 
-    delete $self->{from} if $self->{from} and $self->{from} eq 'trunk';
-    delete $self->{fromtag} if $self->{fromtag} and $self->{fromtag} eq 'trunk';
+    if ($self->{from}) {
+        $self->{from} = $proj->branch_name ($target->path) if $self->{from} eq '.';
+        delete $self->{from} if $self->{from} eq 'trunk';
+    }
+    if ($self->{fromtag}) {
+        $self->{fromtag} = $proj->tag_name ($target->path) if $self->{fromtag} eq '.';
+        delete $self->{fromtag} if $self->{fromtag} eq 'trunk';
+    }
     my $src_path = $self->{fromtag} ?
 	$proj->tag_path($self->{fromtag}) :
 	$proj->branch_path($self->{from} ? $self->{from} : 'trunk');

Modified: trunk/t/bm/tag-from-wc.t
==============================================================================
--- trunk/t/bm/tag-from-wc.t	(original)
+++ trunk/t/bm/tag-from-wc.t	Fri Sep 12 05:01:33 2008
@@ -36,9 +36,6 @@
 is_output ($svk, 'branch', ['--list', '--tag'],
     ['Bar']);
 
-TODO: {
-local $TODO = 'incorrect from locating';
 $svk->br('--create','Bar2','--tag','--from','.');
 is_output ($svk, 'branch', ['--list', '--tag'],
     ['Bar','Bar2']);
-}