equal
deleted
inserted
replaced
895 p = self.wjoin(f) |
895 p = self.wjoin(f) |
896 if os.path.exists(p): |
896 if os.path.exists(p): |
897 self.ui.warn("%s still exists!\n" % f) |
897 self.ui.warn("%s still exists!\n" % f) |
898 elif self.dirstate.state(f) == 'a': |
898 elif self.dirstate.state(f) == 'a': |
899 self.ui.warn("%s never committed!\n" % f) |
899 self.ui.warn("%s never committed!\n" % f) |
900 self.dirstate.forget(f) |
900 self.dirstate.forget([f]) |
901 elif f not in self.dirstate: |
901 elif f not in self.dirstate: |
902 self.ui.warn("%s not tracked!\n" % f) |
902 self.ui.warn("%s not tracked!\n" % f) |
903 else: |
903 else: |
904 self.dirstate.update([f], "r") |
904 self.dirstate.update([f], "r") |
905 |
905 |