--- a/tests/test-revlog-ancestry.py	Thu Oct 18 10:11:08 2018 -0700
+++ b/tests/test-revlog-ancestry.py	Thu Feb 09 09:17:40 2017 -0800
@@ -22,10 +22,10 @@
     commit(name, time)
 
 def update(rev):
-    merge.update(repo, rev, False, True)
+    merge.update(repo, rev, branchmerge=False, force=True)
 
 def merge_(rev):
-    merge.update(repo, rev, True, False)
+    merge.update(repo, rev, branchmerge=True, force=False)
 
 if __name__ == '__main__':
     addcommit(b"A", 0)