martinvonz marked an inline comment as done. martinvonz updated this revision to Diff 20359.
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8169?vs=20345&id=20359 BRANCH default 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 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__': To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
