equal
deleted
inserted
replaced
603 not self.inmemory): |
603 not self.inmemory): |
604 ui.note(_("update back to initial working directory parent\n")) |
604 ui.note(_("update back to initial working directory parent\n")) |
605 hg.updaterepo(repo, newwd, False) |
605 hg.updaterepo(repo, newwd, False) |
606 |
606 |
607 collapsedas = None |
607 collapsedas = None |
608 if not self.keepf: |
608 if self.collapsef and not self.keepf: |
609 if self.collapsef: |
609 collapsedas = newnode |
610 collapsedas = newnode |
|
611 clearrebased(ui, repo, self.destmap, self.state, self.skipped, |
610 clearrebased(ui, repo, self.destmap, self.state, self.skipped, |
612 collapsedas, self.keepf, fm=fm) |
611 collapsedas, self.keepf, fm=fm) |
613 |
612 |
614 clearstatus(repo) |
613 clearstatus(repo) |
615 clearcollapsemsg(repo) |
614 clearcollapsemsg(repo) |