equal
deleted
inserted
replaced
591 newrev = repo[newnode].rev() |
591 newrev = repo[newnode].rev() |
592 for oldrev in self.state: |
592 for oldrev in self.state: |
593 self.state[oldrev] = newrev |
593 self.state[oldrev] = newrev |
594 |
594 |
595 if 'qtip' in repo.tags(): |
595 if 'qtip' in repo.tags(): |
596 updatemq(repo, self.state, self.skipped, **opts) |
596 updatemq(repo, self.state, self.skipped, |
|
597 **pycompat.strkwargs(opts)) |
597 |
598 |
598 # restore original working directory |
599 # restore original working directory |
599 # (we do this before stripping) |
600 # (we do this before stripping) |
600 newwd = self.state.get(self.originalwd, self.originalwd) |
601 newwd = self.state.get(self.originalwd, self.originalwd) |
601 if newwd < 0: |
602 if newwd < 0: |