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
|
mtn_setup()
-- this test is kinda like fork, only it doesn't commit the right side of
-- the fork; instead, it updates, and (in theory) shifts from right to
-- merged-with-left
check(get("origfile", "testfile"))
addfile("testfile")
commit()
root_r_sha = base_revision()
root_f_sha = sha1("testfile")
check(get("firstinsert", "testfile"))
commit()
left_r_sha = base_revision()
left_f_sha = sha1("testfile")
check(left_r_sha ~= root_r_sha)
check(left_f_sha ~= root_f_sha)
probe_node("testfile", root_r_sha, root_f_sha)
check(get("secondinsert", "testfile"))
check(mtn("update"), 0, false, false)
-- files should now be merged
check(get("bothinsert", "probe"))
check(samefile("testfile", "probe"))
|
