Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 45577:5c8230ca37f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
45576:c1b603cdc95a 45577:5c8230ca37f2
785 ) 785 )
786 repo = urepo 786 repo = urepo
787 if overwrite: 787 if overwrite:
788 merge.clean_update(repo[revision]) 788 merge.clean_update(repo[revision])
789 else: 789 else:
790 hg.updaterepo(repo, revision, False) 790 merge.update(repo[revision])
791 791
792 @annotatesubrepoerror 792 @annotatesubrepoerror
793 def merge(self, state): 793 def merge(self, state):
794 self._get(state) 794 self._get(state)
795 cur = self._repo[b'.'] 795 cur = self._repo[b'.']