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
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__':