t/bm/merge.t

9 my ($xd, $svk) = build_test('test');
11 $svk->mkdir(-m => 'trunk', '/test/trunk');
12 $svk->mkdir(-m => 'trunk', '/test/branches');
13 $svk->mkdir(-m => 'trunk', '/test/tags');
19 $svk->mirror('//mirror/MyProject', $uri);
20 $svk->sync('//mirror/MyProject');
23 $svk->checkout('//mirror/MyProject/trunk',$copath);
26 is_output_like ($svk, 'branch', ['--create', 'feature/foo','--switch-to'], qr'Project branch create…
28 $svk->propset ('someprop', 'propvalue', 'A/be');
29 $svk->commit ('-m', 'commit message here (r8)','');
35 is_output ($svk, 'smerge',
40 is_output ($svk, 'branch', ['--merge', '-C', 'feature/foo', 'trunk'],
46 is_output_like ($svk, 'branch', ['--create', 'feature/bar','--switch-to'], qr'Project branch create…
48 $svk->diff();
49 $svk->commit ('-m', 'commit message here (r10)','');
50 is_output ($svk, 'branch', ['--merge', '-C', 'feature/bar', 'trunk'],
55 is_output ($svk, 'branch', ['--merge', '-C', 'feature/foo', 'trunk'],
60 is_output ($svk, 'branch', ['--merge', '-C', 'feature/bar', 'feature/foo', 'trunk'],
69 is_output_like ($svk, 'branch', ['--merge', 'feature/bar', 'feature/foo', 'trunk'],
72 $svk->switch ('//mirror/MyProject/trunk');
76 is_output_like ($svk, 'info', [],
78 is_output_like ($svk, 'info', [],
82 $svk->branch ('--create', 'smerge/bar', '--switch-to');
84 $svk->commit ('-m', 'commit message here (r13)','');
86 $svk->branch ('--switch', 'trunk');
88 $svk->branch ('--create', 'smerge/foo', '--switch-to');
90 $svk->commit ('-m', 'commit message here (r14)','');
94 is_output ($svk, 'branch', ['--merge', '-C', 'smerge/bar', 'smerge/foo', 'trunk'],
102 is_output ($svk, 'branch', ['--merge', 'smerge/bar', 'smerge/foo', 'trunk'],
118 $svk->branch ('--create', 'merge/foo', '--switch-to');
120 $svk->commit ('-m', 'commit message here (r20)','');
121 $svk->switch ('//mirror/MyProject/trunk');
122 $svk->branch ('--merge', '-C', 'merge/foo', 'trunk');
123 is_output ($svk, 'branch', ['--merge', '-C', 'merge/foo', 'trunk'],
127 is_output ($svk, 'branch', ['--merge', '-C', 'merge/foo', '.'],
131 is_output ($svk, 'branch', ['--merge', 'merge/foo', '.'],
139 $svk->branch ('--create', 'merge/foo2', '--switch-to');
141 $svk->commit ('-m', 'commit message here (r20)','');
142 $svk->branch ('--switch', 'merge/foo');
145 is_output ($svk, 'branch', ['--merge', '-C', 'merge/foo2', 'merge/foo'],
150 is_output ($svk, 'branch', ['--merge', '-C', 'merge/foo2', '.'],
166 is_output ($svk, 'branch', ['--merge', 'merge/foo2', '.', '-P', '-'],
184 is_output ($svk, 'branch', ['--merge', 'merge/foo2', '.'],
194 $svk->branch ('--create', 'merge/foo3', '--switch-to');
196 $svk->commit ('-m', 'commit message here (r26)','');
198 $svk->push('-C');
201 $svk->branch ('--switch', 'trunk');
202 is_output ($svk, 'branch', ['--merge', '-C', 'merge/foo3', '.'],
207 is_output ($svk, 'branch', ['--push', '-C', 'merge/foo3'],