diff -r c1b603cdc95a -r 5c8230ca37f2 mercurial/subrepo.py --- 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):