hgext/rebase.py
changeset 7130 204c7850c158
parent 7127 9df67ee30ef5
child 7213 b4c035057d34
equal deleted inserted replaced
7129:7e6a3bae0e8e 7130:204c7850c158
   103             else:
   103             else:
   104                 repair.strip(repo.ui, repo, repo[min(state)].node(), "strip")
   104                 repair.strip(repo.ui, repo, repo[min(state)].node(), "strip")
   105 
   105 
   106         clearstatus(repo)
   106         clearstatus(repo)
   107         ui.status(_("rebase completed\n"))
   107         ui.status(_("rebase completed\n"))
       
   108         if os.path.exists(repo.sjoin('undo')):
       
   109             util.unlink(repo.sjoin('undo'))
   108         if skipped:
   110         if skipped:
   109             ui.note(_("%d revisions have been skipped\n") % len(skipped))
   111             ui.note(_("%d revisions have been skipped\n") % len(skipped))
   110     finally:
   112     finally:
   111         del lock, wlock
   113         del lock, wlock
   112 
   114