--- a/tests/test-revlog-ancestry.py Sat Oct 05 10:29:34 2019 -0400
+++ b/tests/test-revlog-ancestry.py Sun Oct 06 09:45:02 2019 -0400
@@ -11,9 +11,11 @@
repo = hg.repository(u, b'test1', create=1)
os.chdir('test1')
+
def commit(text, time):
repo.commit(text=text, date=b"%d 0" % time)
+
def addcommit(name, time):
f = open(name, 'wb')
f.write(b'%s\n' % name)
@@ -21,12 +23,15 @@
repo[None].add([name])
commit(name, time)
+
def update(rev):
merge.update(repo, rev, branchmerge=False, force=True)
+
def merge_(rev):
merge.update(repo, rev, branchmerge=True, force=False)
+
if __name__ == '__main__':
addcommit(b"A", 0)
addcommit(b"B", 1)