Mercurial > public > mercurial-scm > hg
diff tests/test-revlog-ancestry.py @ 27344:43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
This is relatively rarely used functionality, but migrating this to a
matcher will make future work on narrow clones more feasible.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 14 Dec 2015 18:54:03 -0500 |
| parents | f88c60e740a1 |
| children | abe605bbf0de |
line wrap: on
line diff
--- a/tests/test-revlog-ancestry.py Sat Dec 12 09:57:05 2015 -0800 +++ b/tests/test-revlog-ancestry.py Mon Dec 14 18:54:03 2015 -0500 @@ -17,10 +17,10 @@ commit(name, time) def update(rev): - merge.update(repo, rev, False, True, False) + merge.update(repo, rev, False, True) def merge_(rev): - merge.update(repo, rev, True, False, False) + merge.update(repo, rev, True, False) if __name__ == '__main__': addcommit("A", 0) @@ -82,4 +82,3 @@ print '\nDescendants of 5 and 4' for r in repo.changelog.descendants([5, 4]): print r, -