equal
deleted
inserted
replaced
521 |
521 |
522 def get(self, state, overwrite=False): |
522 def get(self, state, overwrite=False): |
523 self._get(state) |
523 self._get(state) |
524 source, revision, kind = state |
524 source, revision, kind = state |
525 self._repo.ui.debug("getting subrepo %s\n" % self._path) |
525 self._repo.ui.debug("getting subrepo %s\n" % self._path) |
526 hg.clean(self._repo, revision, False) |
526 hg.updaterepo(self._repo, revision, overwrite) |
527 |
527 |
528 def merge(self, state): |
528 def merge(self, state): |
529 self._get(state) |
529 self._get(state) |
530 cur = self._repo['.'] |
530 cur = self._repo['.'] |
531 dst = self._repo[state[1]] |
531 dst = self._repo[state[1]] |