-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy path07smerge-copy-co.t
38 lines (30 loc) · 972 Bytes
/
07smerge-copy-co.t
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
#!/usr/bin/perl -w
use Test::More tests => 4;
use strict;
use File::Path;
use Cwd;
use SVK::Test;
my ($xd, $svk) = build_test();
our $output;
my ($copath, $corpath) = get_copath();
$svk->mkdir ('-m', 'trunk', '//trunk');
my $tree = create_basic_tree ($xd, '//trunk');
$svk->cp ('-m', 'branch', '//trunk', '//local');
$svk->checkout ('//local', $copath);
chdir($copath);
# simple case
$svk->cp('//trunk/A' => '//trunk/A-cp', -m => 'copy A');
is_output ($svk, 'sm', ['-t'],
['Auto-merging (3, 5) /trunk to /local (base /trunk:3).',
'A + A-cp',
qr'New merge ticket: .*:/trunk:5']);
is_output ($svk, 'st', [],
['A + A-cp',
' M .']);
is_output ($svk, 'ci', [-m => 'commit the smerge from checkout'],
['Committed revision 6.']);
$svk->cp('//trunk/me' => '//trunk/me.cp', -m => 'copy me');
is_output ($svk, 'sm', ['-t'],
['Auto-merging (5, 7) /trunk to /local (base /trunk:5).',
'A + me.cp',
qr'New merge ticket: .*:/trunk:7']);