comparison mercurial/subrepo.py @ 14049:92db9667d15a

subrepo: backout bcc6ed0f6c3b

14048:58e58406ed19

    def get(self, state, overwrite=False):
        if overwrite:
            self._svncommand(['revert', '--recursive'])
        status = self._svncommand(['checkout', state[0], '--revision', state[1]])
        if not re.search('Checked out revision [0-9]+.', status):
            # catch the case where the checkout operation is
            # obstructed but the working copy is clean
            if ('already a working copy for a different' in status and
                not self.dirty()):
                self.remove()
                self.get(state, overwrite)
                return
            else:
                raise util.Abort(status.splitlines()[-1])
        self._ui.status(status)

    def merge(self, state):
        old = self._state[1]
        new = state[1]

14049:92db9667d15a

    def get(self, state, overwrite=False):
        if overwrite:
            self._svncommand(['revert', '--recursive'])
        status = self._svncommand(['checkout', state[0], '--revision', state[1]])
        if not re.search('Checked out revision [0-9]+.', status):
            raise util.Abort(status.splitlines()[-1])
        self._ui.status(status)

    def merge(self, state):
        old = self._state[1]
        new = state[1]