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
|
-- Test of annotation of merged but not committed files.
-- Does not currently work, see comments in cmd_files.cc.
mtn_setup()
check(get("testfile"))
check(get("left"))
check(get("right"))
check(get("merged"))
check(get("expected-annotation"))
addfile("testfile")
commit()
anc = base_revision()
revert_to(anc)
copy("left", "testfile")
commit()
left = base_revision()
revert_to(anc)
copy("right", "testfile")
commit()
right = base_revision()
check(mtn("merge_into_workspace", left), 0, false, false)
-- testfile should be the same as merged
check(samefile("merged", "testfile"))
-- annotate should do something sensible
xfail(mtn("annotate", "--brief", "testfile"), 0, {"expected-annotation"}, nil)
-- a commit at this point should succeed
commit()
|
