Mercurial > public > mercurial-scm > hg
diff tests/test-revlog-ancestry.py @ 44400:0e5e192adb6f
tests: use new, use-case-specific methods from merge module
Differential Revision: https://phab.mercurial-scm.org/D8169
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 26 Feb 2020 10:48:56 -0800 |
| parents | 2372284d9457 |
| children | 6000f5b25c9b |
line wrap: on
line diff
--- 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__':