mercurial/subrepo.py

45576:c1b603cdc95a

                )
                repo = urepo
        if overwrite:
            merge.clean_update(repo[revision])
        else:
            hg.updaterepo(repo, revision, False)

    @annotatesubrepoerror
    def merge(self, state):
        self._get(state)
        cur = self._repo[b'.']

45577:5c8230ca37f2

                )
                repo = urepo
        if overwrite:
            merge.clean_update(repo[revision])
        else:
            merge.update(repo[revision])

    @annotatesubrepoerror
    def merge(self, state):
        self._get(state)
        cur = self._repo[b'.']