Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use new, use-case-specific methods from merge module
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 26 Feb 2020 10:48:56 -0800
changeset 44431 0e5e192adb6f
parent 44430 a45ffad9ae98
child 44432 a1908951ca42
tests: use new, use-case-specific methods from merge module Differential Revision: https://phab.mercurial-scm.org/D8169
tests/test-revlog-ancestry.py file | annotate | diff | comparison | revisions 
--- 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__':
hg-stable