Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 45580: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 | 03726f5b6092 |
| children | d2e1dcd4490d |
line wrap: on
line diff
--- a/mercurial/subrepo.py Mon Sep 21 09:57:29 2020 -0700 +++ b/mercurial/subrepo.py Mon Sep 21 11:53:44 2020 -0700 @@ -787,7 +787,7 @@ if overwrite: merge.clean_update(repo[revision]) else: - hg.updaterepo(repo, revision, False) + merge.update(repo[revision]) @annotatesubrepoerror def merge(self, state):