equal
deleted
inserted
replaced
1806 wvfs = self._repo.wvfs |
1806 wvfs = self._repo.wvfs |
1807 f = self._path |
1807 f = self._path |
1808 wvfs.audit(f) |
1808 wvfs.audit(f) |
1809 if wvfs.isdir(f) and not wvfs.islink(f): |
1809 if wvfs.isdir(f) and not wvfs.islink(f): |
1810 wvfs.rmtree(f, forcibly=True) |
1810 wvfs.rmtree(f, forcibly=True) |
1811 for p in reversed(list(util.finddirs(f))): |
1811 if self._repo.ui.configbool('experimental', 'merge.checkpathconflicts'): |
1812 if wvfs.isfileorlink(p): |
1812 for p in reversed(list(util.finddirs(f))): |
1813 wvfs.unlink(p) |
1813 if wvfs.isfileorlink(p): |
1814 break |
1814 wvfs.unlink(p) |
|
1815 break |
1815 |
1816 |
1816 def setflags(self, l, x): |
1817 def setflags(self, l, x): |
1817 self._repo.wvfs.setflags(self._path, l, x) |
1818 self._repo.wvfs.setflags(self._path, l, x) |
1818 |
1819 |
1819 class overlayworkingctx(committablectx): |
1820 class overlayworkingctx(committablectx): |