Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/subrepo.py
changeset 45577 5c8230ca37f2
parent 45556 03726f5b6092
child 45682 d2e1dcd4490d 
--- 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):
mercurial