[svk-commit] r2620 - trunk/t

[nobody at bestpractical.com]

Author: clkao
Date: Fri Dec  7 02:38:40 2007
New Revision: 2620

Modified:
   trunk/t/checksum.t

Log:
make the checksum test actually fail - closer to the checksum problem reported.

Modified: trunk/t/checksum.t
==============================================================================
--- trunk/t/checksum.t	(original)
+++ trunk/t/checksum.t	Fri Dec  7 02:38:40 2007
@@ -2,7 +2,7 @@
 use strict;
 use SVK::Util qw( is_executable );
 use SVK::Test;
-plan tests => 2;
+plan tests => 1;
 our $output;
 
 # Basically, trying to merge a revision containing a copy, where the cop source file is removed at the
@@ -13,24 +13,32 @@
 $svk->mkdir ('-pm', 'init', '//V/A');
 my $tree = create_basic_tree ($xd, '//V/A');
 my ($copath, $corpath) = get_copath ('checksum');
- 
-# branch from r1
-$svk->cp('//V/A' => '//V/B', -m => 'r4 - A => B');
-$svk->checkout('//V',$copath);
+$svk->cp(-m => 'V to X', '//V', '//X');
 
 # r2 - remove file B
-$svk->rm("$copath/B/me");
-$svk->ci(-m => 'r5 - remove file B/me', $copath);
 
+$svk->rm(-m => 'r5 - remove file A/me', "//V/A/me");
+
+$svk->checkout('//V',$copath);
 # r3 - cp B at 1 to C with modification,
-$svk->cp('//V/B/me' => '//V/Cme', -r => 4, -m => 'r6 - B/me at 4 => C');
-$svk->update($copath);
+$svk->cp('//V/A/me' => "$copath/Cme", -r => 4 );
+
 append_file("$copath/Cme", "mmmmmm\n");
-$svk->ci(-m => 'r7 - modify Cme', $copath);
+$svk->ci(-m => 'r8 - modify Cme', $copath);
 # cp A at 2 to B
-$svk->cp('//V/A/D/de' => '//V/B/me', -r => 5, -pm => 'r8 - A at 5 => B');
+$svk->cp('//V/A/D/de' => "$copath/A/me", -r => 5);
+append_file("$copath/A/me", "mmmmmm\n");
+
+$svk->ci(-m => 'some copy with mods', $copath);
+
+TODO: {
+    local $TODO = 'not yet';
+is_output($svk, 'smerge', [-m => 'go', '//V', '//X'],
+	  ['Auto-merging (3, 7) /V to /X (base /V:3).',
+	   'R + A/me',
+	   'R + Cme',
+	   qr'New merge ticket: .*:/V:7',
+	   'Committed revision 8']);
+}
 
-chdir($copath);
-$svk->merge('-r5:8','//V');
-warn $output;
 1;