1-- Test resolving multiple names conflicts
2--
3-- this is currently not supported; we are documenting a test case
4-- that must be considered when implementing it.
5
6mtn_setup()
7
8-- two conflicts on single node; what does 'conflicts resolve_first' do?
9
10addfile("foo", "foo base")
11commit("testbranch", "base")
12base = base_revision()
13
14writefile("foo", "foo left")
15check(mtn("mv", "foo", "bar"), 0, false, false)
16
17commit("testbranch", "left 1")
18left_1 = base_revision()
19
20revert_to(base)
21
22writefile("foo", "foo right")
23check(mtn("mv", "foo", "baz"), 0, false, false)
24commit("testbranch", "right 1")
25right_1 = base_revision()
26
27check(mtn("conflicts", "store"), 0, nil, true)
28check(samelines("stderr", {"mtn: 1 conflict with supported resolutions.",
29                           "mtn: warning: 1 conflict with no supported resolutions.",
30                           "mtn: stored in '_MTN/conflicts'"}))
31
32-- end of file
33