[svk-commit] r2582 - in branches/bm: t/bm

[nobody at bestpractical.com]

Author: clsung
Date: Wed Oct 31 07:43:31 2007
New Revision: 2582

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

Log:
- add $dst->refresh_revision; will pass the test. The failed reason is
  - the 2nd merge in the same run is not taking the new ticket of the 1st merge

Modified: branches/bm/lib/SVK/Command/Branch.pm
==============================================================================
--- branches/bm/lib/SVK/Command/Branch.pm	(original)
+++ branches/bm/lib/SVK/Command/Branch.pm	Wed Oct 31 07:43:31 2007
@@ -255,10 +255,10 @@
     for my $src (@srcs) {
 	my $src_branch_path = $branch_path.'/'.$src;
 	$src = $self->arg_depotpath($src_branch_path);
-	# extract the fromrev and torev from src
 
-	$self->{message} ||= "- Merge $src_branch_path to $dst_branch_path";
+	$self->{message} = "- Merge $src_branch_path to $dst_branch_path";
 	my $ret = $self->SUPER::run($src, $dst);
+	$dst->refresh_revision;
     }
     return;
 }

Modified: branches/bm/t/bm/merge.t
==============================================================================
--- branches/bm/t/bm/merge.t	(original)
+++ branches/bm/t/bm/merge.t	Wed Oct 31 07:43:31 2007
@@ -72,7 +72,8 @@
 $svk->switch ('//mirror/MyProject/trunk');
 is_file_content ('A/Q/qu', "\nonly a bar\nzz\n", 'is the file actually merge?');
 is_file_content ('A/be', "\nsome more foobar\nzz\n", 'is the file actually merge?');
+
 is_output_like ($svk, 'info', [],
-    qr/Merged From: $branch_foo, Rev. 8/);
+    qr/Merged From: $branch_foo, Rev. 8/, 'Merged from feature/foo at rev. 8');
 is_output_like ($svk, 'info', [],
-    qr/Merged From: $branch_bar, Rev. 10/);
+    qr/Merged From: $branch_bar, Rev. 10/, 'Merged from feature/bar at rev. 10');