9 u = uimod.ui.load() |
9 u = uimod.ui.load() |
10 |
10 |
11 repo = hg.repository(u, b'test1', create=1) |
11 repo = hg.repository(u, b'test1', create=1) |
12 os.chdir('test1') |
12 os.chdir('test1') |
13 |
13 |
|
14 |
14 def commit(text, time): |
15 def commit(text, time): |
15 repo.commit(text=text, date=b"%d 0" % time) |
16 repo.commit(text=text, date=b"%d 0" % time) |
|
17 |
16 |
18 |
17 def addcommit(name, time): |
19 def addcommit(name, time): |
18 f = open(name, 'wb') |
20 f = open(name, 'wb') |
19 f.write(b'%s\n' % name) |
21 f.write(b'%s\n' % name) |
20 f.close() |
22 f.close() |
21 repo[None].add([name]) |
23 repo[None].add([name]) |
22 commit(name, time) |
24 commit(name, time) |
23 |
25 |
|
26 |
24 def update(rev): |
27 def update(rev): |
25 merge.update(repo, rev, branchmerge=False, force=True) |
28 merge.update(repo, rev, branchmerge=False, force=True) |
26 |
29 |
|
30 |
27 def merge_(rev): |
31 def merge_(rev): |
28 merge.update(repo, rev, branchmerge=True, force=False) |
32 merge.update(repo, rev, branchmerge=True, force=False) |
|
33 |
29 |
34 |
30 if __name__ == '__main__': |
35 if __name__ == '__main__': |
31 addcommit(b"A", 0) |
36 addcommit(b"A", 0) |
32 addcommit(b"B", 1) |
37 addcommit(b"B", 1) |
33 |
38 |