equal
deleted
inserted
replaced
595 for f in list: |
595 for f in list: |
596 p = self.wjoin(f) |
596 p = self.wjoin(f) |
597 if os.path.exists(p): |
597 if os.path.exists(p): |
598 self.ui.warn(_("%s still exists!\n") % f) |
598 self.ui.warn(_("%s still exists!\n") % f) |
599 elif self.dirstate.state(f) == 'a': |
599 elif self.dirstate.state(f) == 'a': |
600 self.ui.warn(_("%s never committed!\n") % f) |
|
601 self.dirstate.forget([f]) |
600 self.dirstate.forget([f]) |
602 elif f not in self.dirstate: |
601 elif f not in self.dirstate: |
603 self.ui.warn(_("%s not tracked!\n") % f) |
602 self.ui.warn(_("%s not tracked!\n") % f) |
604 else: |
603 else: |
605 self.dirstate.update([f], "r") |
604 self.dirstate.update([f], "r") |