##// END OF EJS Templates
context: skip path conflicts by default when clearing unknown file (issue5776)...
Matt Harbison -
r37329:656ac240 default
parent child Browse files
Show More
@@ -1808,10 +1808,11 b' class workingfilectx(committablefilectx)'
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)
@@ -109,8 +109,7 b' attack back/test where back symlinks to '
109 #else
109 #else
110 ('back' will be a file and cause some other system specific error)
110 ('back' will be a file and cause some other system specific error)
111 $ hg update -Cr2
111 $ hg update -Cr2
112 back: is both a file and a directory
112 abort: $TESTTMP/target/back/test: $ENOTDIR$
113 abort: * (glob)
114 [255]
113 [255]
115 #endif
114 #endif
116
115
General Comments 0
You need to be logged in to leave comments. Login now