--- a/tests/test-revlog-ancestry.py	Wed Feb 26 10:40:31 2020 -0800
+++ b/tests/test-revlog-ancestry.py	Wed Feb 26 10:48:56 2020 -0800
@@ -25,11 +25,11 @@
 
 
 def update(rev):
-    merge.update(repo, rev, branchmerge=False, force=True)
+    merge.clean_update(repo[rev])
 
 
 def merge_(rev):
-    merge.update(repo, rev, branchmerge=True, force=False)
+    merge.merge(repo[rev])
 
 
 if __name__ == '__main__':