equal
deleted
inserted
replaced
1763 |
1763 |
1764 remove.sort() |
1764 remove.sort() |
1765 for f in remove: |
1765 for f in remove: |
1766 self.ui.note("removing %s\n" % f) |
1766 self.ui.note("removing %s\n" % f) |
1767 try: |
1767 try: |
1768 os.unlink(f) |
1768 os.unlink(self.wjoin(f)) |
1769 except OSError, inst: |
1769 except OSError, inst: |
1770 self.ui.warn("update failed to remove %s: %s!\n" % (f, inst)) |
1770 self.ui.warn("update failed to remove %s: %s!\n" % (f, inst)) |
1771 # try removing directories that might now be empty |
1771 # try removing directories that might now be empty |
1772 try: os.removedirs(os.path.dirname(f)) |
1772 try: os.removedirs(os.path.dirname(self.wjoin(f))) |
1773 except: pass |
1773 except: pass |
1774 if moddirstate: |
1774 if moddirstate: |
1775 if mode == 'n': |
1775 if mode == 'n': |
1776 self.dirstate.forget(remove) |
1776 self.dirstate.forget(remove) |
1777 else: |
1777 else: |