-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy path36push-pull-local.t
35 lines (25 loc) · 1.09 KB
/
36push-pull-local.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
#!/usr/bin/perl -w
use Test::More tests => 1;
use strict;
use SVK::Test;
my ($xd, $svk) = build_test();
$svk->mkdir(-m => 'init', '//trunk');
create_basic_tree($xd, '//trunk');
my ($copath_trunk, $corpath_trunk) = get_copath('xm_trunk_co');
my ($copath_branch, $corpath_branch) = get_copath('xm_branch_co');
$svk->checkout('//trunk', $corpath_trunk);
$svk->copy(-m => "make branch", '//trunk', '//branch');
$svk->checkout('//branch', $corpath_branch);
append_file("$corpath_trunk/me", "another line in trunk");
$svk->commit(-m => 'modify on trunk', $corpath_trunk);
TODO: {
local $TODO = 'entirely local pull should actually pull';
# these regexps might not actually be right. The point is it should do SOMETHING with the me file::path
is_output($svk, 'pull', [__($corpath_branch)],
['Auto-merging (3, 5) /trunk to /branch (base /trunk:3).',
'U me',
qr'New merge ticket: .*:/trunk:5',
'Committed revision 6.',
"Syncing //branch(/branch) in $corpath_branch to 6.",
__("U $corpath_branch/me"),]);
}