equal
deleted
inserted
replaced
210 else: |
210 else: |
211 # backup the old csets by default |
211 # backup the old csets by default |
212 repair.strip(ui, repo, repo[min(rebased)].node(), "all") |
212 repair.strip(ui, repo, repo[min(rebased)].node(), "all") |
213 |
213 |
214 clearstatus(repo) |
214 clearstatus(repo) |
215 ui.status(_("rebase completed\n")) |
215 ui.note(_("rebase completed\n")) |
216 if os.path.exists(repo.sjoin('undo')): |
216 if os.path.exists(repo.sjoin('undo')): |
217 util.unlink(repo.sjoin('undo')) |
217 util.unlink(repo.sjoin('undo')) |
218 if skipped: |
218 if skipped: |
219 ui.note(_("%d revisions have been skipped\n") % len(skipped)) |
219 ui.note(_("%d revisions have been skipped\n") % len(skipped)) |
220 finally: |
220 finally: |