[svk-commit] r2934 - trunk/t

[nobody at bestpractical.com]

Author: ruz
Date: Thu Jun 26 23:29:59 2008
New Revision: 2934

Added:
   trunk/t/07smerge-co-deleted.t

Log:
* add failing test

Added: trunk/t/07smerge-co-deleted.t
==============================================================================
--- (empty file)
+++ trunk/t/07smerge-co-deleted.t	Thu Jun 26 23:29:59 2008
@@ -0,0 +1,33 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use Test::More tests => 2;
+use File::Path;
+use Cwd;
+use SVK::Test;
+
+my ($xd, $svk) = build_test();
+our $output;
+my ($copath, $corpath) = get_copath ('smerge');
+$svk->mkdir ('-m', 'trunk', '//trunk');
+my $tree = create_basic_tree ($xd, '//trunk');
+$svk->cp ('-m', 'branch', '//trunk', '//local');
+$svk->rm ('-m', 'remove branch', '//local', '//local-moved');
+$svk->co ('//trunk', $copath);
+append_file("$copath/me", "a change\n");
+$svk->ci ('-m', 'change file', $copath );
+$svk->switch ('//local at 4', $copath);
+
+is_output($svk, 'sm', ['-C', '//trunk', $copath],
+    ['Auto-merging (3, 6) /trunk to /local (base /trunk:3).',
+     'U   t/checkout/smerge/me',
+     qr'New merge ticket: .*:/trunk:6']
+);
+is_output($svk, 'sm', ['//trunk', $copath],
+    ['Auto-merging (3, 6) /trunk to /local (base /trunk:3).',
+     'U   t/checkout/smerge/me',
+     qr'New merge ticket: .*:/trunk:6']
+);
+
+#diag $output;