[svk-commit] r2617 - trunk/t

[nobody at bestpractical.com]

Author: clsung
Date: Thu Dec  6 08:43:44 2007
New Revision: 2617

Added:
   trunk/t/checksum.t

Log:
- a test try to reflect the checksum problem :-/

Added: trunk/t/checksum.t
==============================================================================
--- (empty file)
+++ trunk/t/checksum.t	Thu Dec  6 08:43:44 2007
@@ -0,0 +1,36 @@
+#!/usr/bin/perl -w
+use strict;
+use SVK::Util qw( is_executable );
+use SVK::Test;
+plan tests => 2;
+our $output;
+
+# Basically, trying to merge a revision containing a copy, where the cop source file is removed at the
+# previous  revision, but also a copy with modification on the revision in question
+#< clkao> branch from r1, r2 - remove file B, r3 - cp B at 1 to C with modification, cp A at 2 to B
+#< clkao> so try to merge changes between r1 and r3
+my ($xd, $svk) = build_test();
+$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);
+
+# r2 - remove file B
+$svk->rm("$copath/B/me");
+$svk->ci(-m => 'r5 - remove file B/me', $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);
+append_file("$copath/Cme", "mmmmmm\n");
+$svk->ci(-m => 'r7 - 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');
+
+chdir($copath);
+$svk->merge('-r5:8','//V');
+warn $output;
+1;