Mercurial > public > mercurial-scm > hg
diff mercurial/hg.py @ 45577:5c8230ca37f2
merge: replace calls to hg.updaterepo() by merge.update()
The former no longer buys us anything.
Differential Revision: https://phab.mercurial-scm.org/D9067
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 21 Sep 2020 11:53:44 -0700 |
| parents | 2c86b9587740 |
| children | 00402df57db7 |
line wrap: on
line diff
--- a/mercurial/hg.py Mon Sep 21 09:57:29 2020 -0700 +++ b/mercurial/hg.py Mon Sep 21 11:53:44 2020 -0700 @@ -1061,7 +1061,7 @@ def update(repo, node, quietempty=False, updatecheck=None): """update the working directory to node""" - stats = updaterepo(repo, node, False, updatecheck=updatecheck) + stats = mergemod.update(repo[node], updatecheck=updatecheck) _showstats(repo, stats, quietempty) if stats.unresolvedcount: repo.ui.status(_(b"use 'hg resolve' to retry unresolved file merges\n"))