equal
deleted
inserted
replaced
704 def remove(self, list): |
704 def remove(self, list): |
705 for f in list: |
705 for f in list: |
706 p = self.wjoin(f) |
706 p = self.wjoin(f) |
707 if os.path.isfile(p): |
707 if os.path.isfile(p): |
708 self.ui.warn("%s still exists!\n" % f) |
708 self.ui.warn("%s still exists!\n" % f) |
|
709 elif self.dirstate.state(f) == 'a': |
|
710 self.ui.warn("%s never committed!\n" % f) |
|
711 self.dirstate.forget(f) |
709 elif f not in self.dirstate: |
712 elif f not in self.dirstate: |
710 self.ui.warn("%s not tracked!\n" % f) |
713 self.ui.warn("%s not tracked!\n" % f) |
711 else: |
714 else: |
712 self.dirstate.update([f], "r") |
715 self.dirstate.update([f], "r") |
713 |
716 |