Mercurial > public > mercurial-scm > hg-stable
diff tests/test-revlog-ancestry.py @ 40366:b14fdf1fb615
update: clarify update() call sites by specifying argument names
merge.update() takes a lot of parameters and I get confused all the
time which is which.
Differential Revision: https://phab.mercurial-scm.org/D5153
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 09 Feb 2017 09:17:40 -0800 |
| parents | 5a029f049854 |
| children | 2372284d9457 |
line wrap: on
line diff
--- a/tests/test-revlog-ancestry.py Thu Oct 18 10:11:08 2018 -0700 +++ b/tests/test-revlog-ancestry.py Thu Feb 09 09:17:40 2017 -0800 @@ -22,10 +22,10 @@ commit(name, time) def update(rev): - merge.update(repo, rev, False, True) + merge.update(repo, rev, branchmerge=False, force=True) def merge_(rev): - merge.update(repo, rev, True, False) + merge.update(repo, rev, branchmerge=True, force=False) if __name__ == '__main__': addcommit(b"A", 0)