equal
deleted
inserted
replaced
975 if f in all_files: |
975 if f in all_files: |
976 util.unlink(repo.wjoin(f)) |
976 util.unlink(repo.wjoin(f)) |
977 self.ui.warn(_('done\n')) |
977 self.ui.warn(_('done\n')) |
978 raise |
978 raise |
979 |
979 |
|
980 if not self.applied: |
|
981 return ret[0] |
980 top = self.applied[-1].name |
982 top = self.applied[-1].name |
981 if ret[0] and ret[0] > 1: |
983 if ret[0] and ret[0] > 1: |
982 msg = _("errors during apply, please fix and refresh %s\n") |
984 msg = _("errors during apply, please fix and refresh %s\n") |
983 self.ui.write(msg % top) |
985 self.ui.write(msg % top) |
984 else: |
986 else: |