equal
deleted
inserted
replaced
459 commitmsg=commitmsg, |
459 commitmsg=commitmsg, |
460 extrafn=_makeextrafn(self.extrafns), |
460 extrafn=_makeextrafn(self.extrafns), |
461 editor=editor, |
461 editor=editor, |
462 keepbranches=self.keepbranchesf, |
462 keepbranches=self.keepbranchesf, |
463 date=self.date) |
463 date=self.date) |
464 if newnode is None: |
464 if newnode is not None: |
465 newrev = self.dest |
|
466 else: |
|
467 newrev = repo[newnode].rev() |
465 newrev = repo[newnode].rev() |
468 for oldrev in self.state.iterkeys(): |
466 for oldrev in self.state.iterkeys(): |
469 self.state[oldrev] = newrev |
467 self.state[oldrev] = newrev |
470 |
468 |
471 if 'qtip' in repo.tags(): |
469 if 'qtip' in repo.tags(): |
472 updatemq(repo, self.state, self.skipped, **opts) |
470 updatemq(repo, self.state, self.skipped, **opts) |
473 |
471 |
474 # restore original working directory |
472 # restore original working directory |