Patchwork D8169: tests: use new, use-case-specific methods from merge module

login
register
mail settings
Submitter phabricator
Date Feb. 27, 2020, 6:30 p.m.
Message ID <5e86b50df0f8bcd5adb249189b103fb6@localhost.localdomain>
Download mbox | patch
Permalink /patch/45371/
State Not Applicable
Headers show

Comments

phabricator - Feb. 27, 2020, 6:30 p.m.
Closed by commit rHG0e5e192adb6f: tests: use new, use-case-specific methods from merge module (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8169?vs=20359&id=20368

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8169/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8169

AFFECTED FILES
  tests/test-revlog-ancestry.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel

Patch

diff --git a/tests/test-revlog-ancestry.py b/tests/test-revlog-ancestry.py
--- a/tests/test-revlog-ancestry.py
+++ b/tests/test-revlog-ancestry.py
@@ -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__':