[svk-commit] r2576 - branches/bm/t/bm

[nobody at bestpractical.com]

Author: clsung
Date: Tue Oct 30 02:42:52 2007
New Revision: 2576

Modified:
   branches/bm/t/bm/merge.t

Log:
- fails 9,10 tests

Modified: branches/bm/t/bm/merge.t
==============================================================================
--- branches/bm/t/bm/merge.t	(original)
+++ branches/bm/t/bm/merge.t	Tue Oct 30 02:42:52 2007
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 use strict;
-use Test::More tests => 7;
+use Test::More tests => 10;
 use SVK::Test;
 use File::Path;
 
@@ -24,7 +24,7 @@
 chdir($copath);
 
 is_output_like ($svk, 'branch', ['--create', 'feature/foo','--switch-to'], qr'Project branch created: feature/foo');
-append_file ('A/be', "\nsome more foobar\nzz\n");
+overwrite_file ('A/be', "\nsome more foobar\nzz\n");
 $svk->propset ('someprop', 'propvalue', 'A/be');
 $svk->diff();
 $svk->commit ('-m', 'commit message here (r8)','');
@@ -36,7 +36,7 @@
 
 # another branch
 is_output_like ($svk, 'branch', ['--create', 'feature/bar','--switch-to'], qr'Project branch created: feature/bar');
-append_file ('A/Q/qu', "\nonly a bar\nzz\n");
+overwrite_file ('A/Q/qu', "\nonly a bar\nzz\n");
 $svk->diff();
 $svk->commit ('-m', 'commit message here (r10)','');
 is_output ($svk, 'branch', ['--merge', '-C', 'feature/bar', 'trunk'], 
@@ -48,3 +48,10 @@
 is_output ($svk, 'branch', ['--merge', '-C', 'feature/bar', 'feature/foo', 'trunk'], 
     [ "Checking locally against mirror source $uri.", 'g   A/Q/qu',
       "Checking locally against mirror source $uri.", 'gg  A/be']);
+
+is_output_like ($svk, 'branch', ['--merge', 'feature/bar', 'feature/foo', 'trunk'], 
+    qr/Committed revision 13 from revision 11./);
+
+$svk->switch ('//mirror/MyProject/trunk');
+is_file_content ('A/Q/qu', "\nonly a bar\nzz\n");
+is_file_content ('A/be', "\nsome more foobar\nzz\n");